--- kdelibs-3.5.10.dfsg.1.orig/acinclude.m4
+++ kdelibs-3.5.10.dfsg.1/acinclude.m4
@@ -1613,6 +1613,11 @@
   fi
 done
 
+# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
+LIB_QT_EXT="$LIB_QT"
+LIB_QT="$kde_int_qt"
+
+AC_SUBST(LIB_QT_EXT)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_QPE)
 
@@ -1713,15 +1718,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)
@@ -2168,9 +2164,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
 ],
@@ -2708,7 +2701,7 @@
 ],
     [return (TIFFOpen( "", "r") == 0); ],
 [
-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
+    kde_cv_libtiff_$1="-l$1"
 ], [
     kde_cv_libtiff_$1=no
 ])
@@ -2772,7 +2765,8 @@
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
+           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
@@ -2788,7 +2782,7 @@
                RgbaInputFile file ("dummy");
                return 0;
                ],
-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
+               eval "ac_cv_libexr='$kde_libexr_libs'",
                eval "ac_cv_libexr=no"
            )
            LIBS="$kde_save_LIBS"
@@ -2797,7 +2791,7 @@
            ])dnl
            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
-               LIB_EXR="$ac_cv_libexr"
+               LIB_EXR="$kde_libexr_libs"
                AC_MSG_RESULT($ac_cv_libexr)
            else
                AC_MSG_RESULT(no)
@@ -2864,7 +2858,7 @@
 AC_CACHE_VAL(ac_cv_jasper,
 [
 kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
+LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
 kde_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
 
@@ -2875,7 +2869,7 @@
     [
     return( jas_init() );
     ],
-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
+    eval "ac_cv_jasper='-ljasper -lm'",
     eval "ac_cv_jasper=no"
 )
 LIBS="$kde_save_LIBS"
@@ -4498,7 +4492,7 @@
 kde_save_cflags="$CFLAGS"
 CFLAGS="$CFLAGS $PYTHONINC"
 kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
+LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
 kde_save_ldflags="$LDFLAGS"
 LDFLAGS="$LDFLAGS $PYTHONLIB"
 
@@ -4636,7 +4630,7 @@
     and contact the authors to let them know about this problem])
 	])
 
-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
+  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
   AC_SUBST(PYTHONINC)
   AC_SUBST(PYTHONLIB)
   AC_SUBST(LIBPYTHON)
@@ -5996,30 +5990,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, 2006, 2007
 ## 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 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6079,7 +6058,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
@@ -6129,7 +6108,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.
@@ -6149,7 +6128,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"
@@ -6169,6 +6148,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"
@@ -6181,22 +6161,24 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 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*)
@@ -6237,11 +6219,58 @@
 # 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_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$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_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$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
@@ -6251,12 +6280,20 @@
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -6314,15 +6351,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
@@ -6487,18 +6524,21 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # 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-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -6510,8 +6550,10 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -6544,6 +6586,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)
@@ -6567,7 +6625,7 @@
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -6575,7 +6633,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)
@@ -6585,8 +6643,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
@@ -6606,17 +6666,23 @@
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$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
@@ -6640,7 +6706,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*)
@@ -6669,24 +6735,77 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
-    # 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` &&
-	    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
-    done
-    testring=
-    # 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.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+  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
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      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`
+    else
+      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`
+        teststring=$teststring$teststring
+      done
+      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.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -6699,7 +6818,7 @@
 
 
 # _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -6707,7 +6826,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 :
@@ -6773,17 +6892,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
@@ -6795,7 +6916,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
@@ -6832,7 +6953,7 @@
     lt_cv_dlopen_self=yes
     ])
    ;;
-    
+
   *)
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
@@ -6866,7 +6987,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"
@@ -6879,7 +7000,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(
@@ -6911,7 +7032,8 @@
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -6919,14 +7041,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -6934,7 +7049,7 @@
    # 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)
@@ -6946,13 +7061,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*
@@ -7011,8 +7131,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 &&
@@ -7061,6 +7181,7 @@
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -7069,7 +7190,7 @@
    *)
   AC_MSG_RESULT([no])
     ;;
-  esac  
+  esac
 fi
 ])# AC_LIBTOOL_SYS_LIB_STRIP
 
@@ -7078,11 +7199,12 @@
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -7092,7 +7214,58 @@
 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"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_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.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -7157,7 +7330,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*)
@@ -7166,7 +7339,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}'
@@ -7182,7 +7355,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -7194,7 +7367,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'
@@ -7224,7 +7398,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
     ;;
@@ -7247,13 +7421,9 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -7270,20 +7440,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*)
@@ -7301,14 +7468,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
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -7328,9 +7500,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
@@ -7345,7 +7517,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
@@ -7356,7 +7528,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
@@ -7368,6 +7540,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix[[3-9]]*)
+  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 ;;
@@ -7411,29 +7595,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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;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,
@@ -7443,6 +7624,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
@@ -7452,7 +7645,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
@@ -7480,8 +7673,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
@@ -7501,7 +7699,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'
@@ -7519,11 +7717,8 @@
   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
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
@@ -7551,7 +7746,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'
@@ -7584,6 +7779,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}'
@@ -7597,13 +7815,19 @@
 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
 
 
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -7621,6 +7845,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.
@@ -7647,7 +7874,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=""
@@ -7709,7 +7938,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
@@ -7747,7 +7976,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)
@@ -7859,7 +8088,7 @@
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -7883,7 +8112,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
@@ -7922,7 +8151,7 @@
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -7993,7 +8222,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'*)
@@ -8025,7 +8254,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
@@ -8052,6 +8281,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,7 +8298,7 @@
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -8085,44 +8323,42 @@
   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',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 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.*`
       ;;
@@ -8138,7 +8374,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
@@ -8154,43 +8390,27 @@
   esac
   ;;
 
+interix[[3-9]]*)
+  # 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
@@ -8209,32 +8429,26 @@
   ;;
 
 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*)
+rdos*)
   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]]'
@@ -8255,10 +8469,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
@@ -8278,36 +8495,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"
@@ -8339,13 +8563,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
@@ -8364,13 +8588,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
@@ -8408,10 +8632,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
 # --------------
@@ -8451,7 +8686,7 @@
 
 
 # AC_LIBTOOL_RC
-# --------------
+# -------------
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
@@ -8477,43 +8712,16 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _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
@@ -8527,9 +8735,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])
 
@@ -8538,7 +8746,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
@@ -8547,48 +8755,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])
 
@@ -8613,7 +8784,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)=
@@ -8625,6 +8796,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)=
@@ -8642,21 +8814,25 @@
 _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
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # 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); }'
 
 # 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
@@ -8667,18 +8843,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
@@ -8696,8 +8872,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'
@@ -8723,7 +8899,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
@@ -8753,8 +8929,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
@@ -8771,7 +8962,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`
@@ -8779,7 +8970,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -8790,8 +8981,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
@@ -8800,15 +8995,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.
@@ -8817,13 +9013,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
@@ -8832,16 +9027,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
       *)
@@ -8855,12 +9060,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
@@ -8869,70 +9074,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` $xlcverstring'
+          _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 $xlcverstring~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
@@ -8943,14 +9159,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
@@ -8967,12 +9183,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.
@@ -8981,11 +9197,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
@@ -8995,33 +9211,20 @@
     ;;
   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_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)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
       *)
-	_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
@@ -9032,17 +9235,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
@@ -9058,12 +9264,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
@@ -9074,11 +9283,25 @@
 	;;
     esac
     ;;
+  interix[[3-9]]*)
+    _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
@@ -9089,9 +9312,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
@@ -9100,16 +9323,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.
@@ -9127,20 +9350,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'
@@ -9156,6 +9403,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _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)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  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
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -9168,7 +9438,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -9178,7 +9448,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=
@@ -9189,15 +9459,35 @@
     # 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*)
+    if test -f /usr/libexec/ld.so; then
+      _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'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
   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)=:
@@ -9207,14 +9497,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)=:
@@ -9232,7 +9522,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)=:
@@ -9251,13 +9541,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)=:
@@ -9266,17 +9556,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'
@@ -9295,7 +9585,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)=:
@@ -9316,27 +9606,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
@@ -9349,36 +9626,28 @@
     ;;
   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.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # 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)='-z allextract$convenience -z 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
@@ -9386,9 +9655,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'
@@ -9398,9 +9667,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
@@ -9409,9 +9678,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
@@ -9420,16 +9689,73 @@
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     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
@@ -9466,8 +9792,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)
 
@@ -9485,7 +9809,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
@@ -9539,7 +9863,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
@@ -9579,7 +9903,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
@@ -9615,13 +9939,70 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # 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)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # 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.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  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'.
@@ -9657,20 +10038,31 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # 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])
@@ -9680,7 +10072,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
@@ -9688,8 +10080,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])
@@ -9699,8 +10093,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"
 
@@ -9710,8 +10102,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)
 
@@ -9737,23 +10127,30 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # 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) {}; }'
 
 # 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
@@ -9765,8 +10162,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)
 
@@ -9776,7 +10171,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'.
@@ -9792,7 +10187,7 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -9800,11 +10195,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)
@@ -9830,11 +10230,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 \
@@ -9875,6 +10276,7 @@
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -9884,7 +10286,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 | \
@@ -9921,7 +10323,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -9950,11 +10352,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=
@@ -9985,6 +10387,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
@@ -9996,6 +10404,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
@@ -10015,7 +10426,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
@@ -10046,7 +10457,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -10061,7 +10472,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?
@@ -10237,7 +10648,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -10290,7 +10701,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
 
@@ -10317,6 +10731,7 @@
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10332,9 +10747,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'"
 
@@ -10356,14 +10768,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]]'
@@ -10381,14 +10809,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
@@ -10527,12 +10958,14 @@
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -10544,6 +10977,10 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    interix[[3-9]]*)
+      # 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
@@ -10552,7 +10989,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*)
 	;;
       *)
@@ -10577,18 +11014,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'
 	    ;;
@@ -10596,22 +11043,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
 	      ;;
@@ -10624,9 +11071,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.
@@ -10635,20 +11086,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.
@@ -10656,6 +11113,14 @@
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _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 '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -10665,25 +11130,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
@@ -10697,24 +11162,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'
 	    ;;
@@ -10724,12 +11180,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'
 	    ;;
@@ -10739,7 +11195,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -10747,7 +11203,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*)
 	;;
@@ -10778,13 +11241,15 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
@@ -10794,6 +11259,11 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    interix[[3-9]]*)
+      # 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.
@@ -10810,7 +11280,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
 	;;
@@ -10836,8 +11306,18 @@
 	_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*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -10847,7 +11327,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
 	;;
@@ -10870,18 +11350,41 @@
       _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.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _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)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _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)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -10891,15 +11394,19 @@
       _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'
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
     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*)
@@ -10908,7 +11415,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'
@@ -10921,6 +11428,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'
@@ -10948,7 +11466,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)=
@@ -10957,6 +11475,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)=])
 ])
 
 
@@ -10964,7 +11492,8 @@
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -10981,7 +11510,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'
@@ -11007,7 +11539,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*
@@ -11024,7 +11556,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
@@ -11034,6 +11567,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
     ;;
@@ -11044,6 +11581,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*)
@@ -11081,7 +11639,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
@@ -11091,13 +11649,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/'\'' -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
@@ -11106,23 +11664,79 @@
 	  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
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd*)
+    interix[[3-9]]*)
+      _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'
+      ;;
+
+    gnu* | 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
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    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
@@ -11136,13 +11750,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=
@@ -11152,24 +11793,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)
@@ -11181,7 +11817,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
@@ -11203,9 +11839,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
@@ -11222,7 +11870,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`
@@ -11230,7 +11878,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -11241,8 +11889,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
@@ -11250,30 +11902,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
@@ -11282,13 +11934,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
       ;;
@@ -11301,7 +11951,7 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi4*)
+    bsdi[[45]]*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -11311,69 +11961,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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _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` $xlcverstring'
+         _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 $xlcverstring~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*)
@@ -11406,8 +12056,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
@@ -11415,7 +12065,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
@@ -11429,47 +12079,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'
 
@@ -11483,7 +12148,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'
@@ -11493,7 +12158,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
@@ -11513,23 +12178,28 @@
       ;;
 
     openbsd*)
-      _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_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 $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
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _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
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -11537,14 +12207,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'
@@ -11556,13 +12226,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'
@@ -11570,21 +12240,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'
@@ -11593,8 +12257,17 @@
       _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 and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -11603,7 +12276,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
@@ -11651,36 +12324,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* | 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
-      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*)
@@ -11698,11 +12380,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?
 #
@@ -11722,14 +12399,15 @@
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-  
+      echo "$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=
@@ -11824,6 +12502,30 @@
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 ############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
@@ -11846,18 +12548,19 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # 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
@@ -11884,6 +12587,7 @@
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
--- kdelibs-3.5.10.dfsg.1.orig/config.h.in
+++ kdelibs-3.5.10.dfsg.1/config.h.in
@@ -1,8 +1,14 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* 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 +109,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 +570,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 +600,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
 
@@ -816,9 +828,17 @@
 /* Defined if compiling without arts */
 #undef WITHOUT_ARTS
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* where rgb.txt is in */
 #undef X11_RGBFILE
--- kdelibs-3.5.10.dfsg.1.orig/Makefile.am
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -128,6 +128,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -242,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@
@@ -270,6 +271,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -279,6 +281,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -307,6 +310,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -357,6 +361,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -414,6 +419,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -421,7 +427,7 @@
 xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
-COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio
+COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
 AUTOMAKE_OPTIONS = foreign 1.6.1
 potdir = $(kde_includes)
 pot_DATA = kde.pot
@@ -440,7 +446,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*) \
@@ -482,12 +488,12 @@
 $(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
@@ -499,7 +505,7 @@
 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 $@
@@ -514,7 +520,7 @@
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
+	-rm -f libtool config.lt
 install-potDATA: $(pot_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(potdir)" || $(MKDIR_P) "$(DESTDIR)$(potdir)"
@@ -608,7 +614,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -960,10 +966,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:
@@ -1124,7 +1128,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 files configure.files Makefile.am.in.wo aclocal.m4 messages.po LIST Makefile.am.in stamp-h.in COPYING-DOCS subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs Makefile.am acinclude.m4 configure 
 
 #>+ 2
 docs-am:
--- kdelibs-3.5.10.dfsg.1.orig/configure
+++ kdelibs-3.5.10.dfsg.1/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -586,15 +608,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
@@ -768,431 +790,509 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+kate_SUBDIR_included_FALSE
+kate_SUBDIR_included_TRUE
+kdewidgets_SUBDIR_included_FALSE
+kdewidgets_SUBDIR_included_TRUE
+interfaces_SUBDIR_included_FALSE
+interfaces_SUBDIR_included_TRUE
+khtml_SUBDIR_included_FALSE
+khtml_SUBDIR_included_TRUE
+kcmshell_SUBDIR_included_FALSE
+kcmshell_SUBDIR_included_TRUE
+kmdi_SUBDIR_included_FALSE
+kmdi_SUBDIR_included_TRUE
+kspell2_SUBDIR_included_FALSE
+kspell2_SUBDIR_included_TRUE
+kabc_SUBDIR_included_FALSE
+kabc_SUBDIR_included_TRUE
+kdeprint_SUBDIR_included_FALSE
+kdeprint_SUBDIR_included_TRUE
+kinit_SUBDIR_included_FALSE
+kinit_SUBDIR_included_TRUE
+kcert_SUBDIR_included_FALSE
+kcert_SUBDIR_included_TRUE
+doc_SUBDIR_included_FALSE
+doc_SUBDIR_included_TRUE
+pics_SUBDIR_included_FALSE
+pics_SUBDIR_included_TRUE
+mimetypes_SUBDIR_included_FALSE
+mimetypes_SUBDIR_included_TRUE
+licenses_SUBDIR_included_FALSE
+licenses_SUBDIR_included_TRUE
+libkscreensaver_SUBDIR_included_FALSE
+libkscreensaver_SUBDIR_included_TRUE
+libkmid_SUBDIR_included_FALSE
+libkmid_SUBDIR_included_TRUE
+kutils_SUBDIR_included_FALSE
+kutils_SUBDIR_included_TRUE
+kstyles_SUBDIR_included_FALSE
+kstyles_SUBDIR_included_TRUE
+kresources_SUBDIR_included_FALSE
+kresources_SUBDIR_included_TRUE
+kparts_SUBDIR_included_FALSE
+kparts_SUBDIR_included_TRUE
+knewstuff_SUBDIR_included_FALSE
+knewstuff_SUBDIR_included_TRUE
+kioslave_SUBDIR_included_FALSE
+kioslave_SUBDIR_included_TRUE
+kimgio_SUBDIR_included_FALSE
+kimgio_SUBDIR_included_TRUE
+kdoctools_SUBDIR_included_FALSE
+kdoctools_SUBDIR_included_TRUE
+kconf_update_SUBDIR_included_FALSE
+kconf_update_SUBDIR_included_TRUE
+kab_SUBDIR_included_FALSE
+kab_SUBDIR_included_TRUE
+dnssd_SUBDIR_included_FALSE
+dnssd_SUBDIR_included_TRUE
+arts_SUBDIR_included_FALSE
+arts_SUBDIR_included_TRUE
+kded_post_SUBDIR_included_FALSE
+kded_post_SUBDIR_included_TRUE
+kded_SUBDIR_included_FALSE
+kded_SUBDIR_included_TRUE
+kio_SUBDIR_included_FALSE
+kio_SUBDIR_included_TRUE
+kwallet_SUBDIR_included_FALSE
+kwallet_SUBDIR_included_TRUE
+kjs_SUBDIR_included_FALSE
+kjs_SUBDIR_included_TRUE
+kdesu_SUBDIR_included_FALSE
+kdesu_SUBDIR_included_TRUE
+kdeui_SUBDIR_included_FALSE
+kdeui_SUBDIR_included_TRUE
+kunittest_SUBDIR_included_FALSE
+kunittest_SUBDIR_included_TRUE
+kdecore_SUBDIR_included_FALSE
+kdecore_SUBDIR_included_TRUE
+kdefx_SUBDIR_included_FALSE
+kdefx_SUBDIR_included_TRUE
+libltdl_SUBDIR_included_FALSE
+libltdl_SUBDIR_included_TRUE
+dcop_SUBDIR_included_FALSE
+dcop_SUBDIR_included_TRUE
+TOPSUBDIRS
+undefined_symbols_allowed_FALSE
+undefined_symbols_allowed_TRUE
+LIBASOUND
+include_hspell_plugin_FALSE
+include_hspell_plugin_TRUE
+include_aspell_plugin_FALSE
+include_aspell_plugin_TRUE
+PCRECFLAGS
+LIBPCRE
+GSSAPI_RPATH
+GSSAPI_LIBS
+GSSAPI_INCS
+include_bzip2_FALSE
+include_bzip2_TRUE
+LIBSSL
+SSL_LDFLAGS
+SSL_INCLUDES
+LIBVOLMGT
+LIBFAM
+KDEINIT_SETUID
+KDEINIT_XFT_INCLUDES
+include_EXR_MODULES_FALSE
+include_EXR_MODULES_TRUE
+include_JP2_MODULES_FALSE
+include_JP2_MODULES_TRUE
+include_TIFF_MODULES_FALSE
+include_TIFF_MODULES_TRUE
+EXR_FLAGS
+LIB_EXR
+LIB_JASPER
+LIBTIFF
+KJAVA_POLICYPATH
+LIBTHAI
+DOJAVA_FALSE
+DOJAVA_TRUE
+MEINPROC_DEP
+HELP_SUBDIR
+LIBXML_RPATH
+LIBXML_CFLAGS
+LIBXML_LIBS
+LIBXSLT_RPATH
+LIBXSLT_CFLAGS
+LIBXSLT_LIBS
+include_BZIP2_FALSE
+include_BZIP2_TRUE
+LIBBZ2
+path_sudo
+path_su
+cups_modeldir
+LIB_CUPS
+include_cups_SUBDIR_FALSE
+include_cups_SUBDIR_TRUE
+kde_cups_config
+KDE_FORCE_INLINE
+include_SVGICONS_FALSE
+include_SVGICONS_TRUE
+LIBART_RPATH
+LIBART_CFLAGS
+LIBART_LIBS
+LIB_IDN
+LUA_LIBS
+LUA_INCLUDES
+LUA
+AVAHI_LIBS
+AVAHI_CFLAGS
+have_pkg_config
+MD5SUM
+include_VERSION_SCRIPT_FALSE
+include_VERSION_SCRIPT_TRUE
+KDE_HAS_DOXYGEN
+DOXYGEN_PROJECT_NUMBER
+DOXYGEN_PROJECT_NAME
+DOXYGEN
+KDE_HAVE_DOT
+QTDOCDIR
+LIBUTEMPTER
+ICE_RLIB
+ICE_SUBDIR
+HAVE_MITSHM
+HAVE_SENDFILE
+EXTRA_SUBDIRS
+LIB_KIMGIO
+LIBICE
+QNAMESPACE_H
+LIB_KFM
+LIB_KFILE
+LIB_KSYCOCA
+LIB_KUNITTEST
+LIB_KDNSSD
+LIB_KNEWSTUFF
+LIB_KIMPROXY
+LIB_KDEPIM
+LIB_KUTILS
+LIB_KDEPRINT
+LIB_KPARTS
+LIB_KSPELL
+LIB_KHTML
+LIB_KABC
+LIB_KAB
+LIB_SMB
+LIB_KJS
+LIB_KIO
+LIB_KDEUI
+LIB_KDECORE
+LIB_KDED
+kde_widgetdir
+kde_styledir
+kdeinitdir
+kde_moduledir
+kde_servicetypesdir
+kde_servicesdir
+kde_templatesdir
+xdg_directorydir
+xdg_menudir
+xdg_appsdir
+kde_bindir
+kde_wallpaperdir
+kde_mimedir
+kde_kcfgdir
+kde_confdir
+kde_locale
+kde_datadir
+kde_sounddir
+kde_icondir
+kde_appsdir
+kde_htmldir
+XMLLINT
+KDE_XSL_STYLESHEET
+MEINPROC
+ARTSCCONFIG
+MCOPIDL
+DCOP_DEPENDENCIES
+DCOPIDL2CPP
+DCOPIDL
+DCOPIDLNG
+KCFG_DEPENDENCIES
+KCONFIG_COMPILER
+MAKEKDEWIDGETS
+include_ARTS_FALSE
+include_ARTS_TRUE
+AUTODIRS
+all_libraries
+all_includes
+KDE_INCLUDES
+KDE_LDFLAGS
+kde_includes
+kde_libraries
+X_RPATH
+KDE_RPATH
+KDE_EXTRA_RPATH
+kde_qtver
+LIB_QPE
+LIB_QT
+LIB_QT_EXT
+UIC_TR
+UIC
+MOC
+PERL
+QT_LDFLAGS
+QT_INCLUDES
+qt_includes
+qt_libraries
+LIBJPEG
+LIBPNG
+LIBZ
+USER_LDFLAGS
+USER_INCLUDES
+KDE_MT_LIBS
+KDE_MT_LDFLAGS
+USE_THREADS
+LIBPTHREAD
+PKG_CONFIG
+LIB_XEXT
+QTE_NORTTI
+x_libraries
+x_includes
+X_LDFLAGS
+X_INCLUDES
+LIBSM
+LIB_XRENDER
+LIB_X11
+X_PRE_LIBS
+XMKMF
+include_x11_FALSE
+include_x11_TRUE
+KDE_USE_PIE
+KDE_USE_FPIE
+LIBDL
+LIBUCB
+X_EXTRA_LIBS
+LIBSOCKET
+FRAMEWORK_COREAUDIO
+LIB_POLL
+LIBRESOLV
+LIBCRYPT
+LIBCOMPAT
+LIBUTIL
+ACL_LIBS
+ALLOCA
+XGETTEXT
+GMSGFMT
+MSGFMT
+LIBADD_DL
+CONVENIENCE_LTDL_FALSE
+CONVENIENCE_LTDL_TRUE
+INSTALL_LTDL_FALSE
+INSTALL_LTDL_TRUE
+KDE_CHECK_PLUGIN
+KDE_PLUGIN
+LIBTOOL
+ac_ct_F77
+FFLAGS
+F77
+RANLIB
+AR
+ECHO
+LN_S
+EGREP
+GREP
+SED
+KDE_USE_NMCHECK_FALSE
+KDE_USE_NMCHECK_TRUE
+KDE_NO_UNDEFINED
+KDE_USE_CLOSURE_FALSE
+KDE_USE_CLOSURE_TRUE
+KDE_USE_FINAL_FALSE
+KDE_USE_FINAL_TRUE
+LDFLAGS_NEW_DTAGS
+LDFLAGS_AS_NEEDED
+ENABLE_PERMISSIVE_FLAG
+NOOPT_CFLAGS
+NOOPT_CXXFLAGS
+CXXCPP
+USE_RTTI
+USE_EXCEPTIONS
+unsermake_enable_pch_FALSE
+unsermake_enable_pch_TRUE
+HAVE_GCC_VISIBILITY
+WOVERLOADED_VIRTUAL
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+CONF_FILES
+kde_libs_htmldir
+kde_libs_prefix
+target_alias
+host_alias
 build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_fast_perl
+enable_maintainer_mode
+enable_debug
+enable_dummyoption
+enable_strict
+enable_warnings
+enable_profile
+enable_dependency_tracking
+enable_pch
+enable_coverage
+enable_new_ldflags
+enable_final
+enable_closure
+enable_nmcheck
+enable_shared
+enable_static
+enable_libsuffix
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+enable_ltdl_install
+with_acl
+enable_pie
+enable_embedded
+enable_qtopia
+enable_mac
+enable_mt
+enable_threading
+with_extra_includes
+with_extra_libs
+with_qt_dir
+with_qt_includes
+with_qt_libraries
+enable_rpath
+enable_gcc_hidden_visibility
+with_arts
+enable_sendfile
+enable_mitshm
+with_rgbfile
+with_distribution
+with_utempter
+with_lua
+with_lua_dir
+with_lua_includes
+with_lua_libraries
+enable_openpty
+with_libidn
+with_libart
+enable_fast_malloc
+enable_cups
+with_sudo_kdesu_backend
+with_libthai
+with_tiff
+with_jasper
+with_openexr
+enable_libfam
+enable_dnotify
+enable_inotify
+with_ssl_dir
+with_ssl
+with_gssapi
+enable_pcre
+with_aspell
+with_hspell
+with_alsa
+'
+      ac_precious_vars='build_alias
 host_alias
 target_alias
-kde_libs_prefix
-kde_libs_htmldir
-CONF_FILES
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
 CC
 CFLAGS
 LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CPP
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-WOVERLOADED_VIRTUAL
-HAVE_GCC_VISIBILITY
-unsermake_enable_pch_TRUE
-unsermake_enable_pch_FALSE
-USE_EXCEPTIONS
-USE_RTTI
-CXXCPP
-NOOPT_CXXFLAGS
-NOOPT_CFLAGS
-ENABLE_PERMISSIVE_FLAG
-LDFLAGS_AS_NEEDED
-LDFLAGS_NEW_DTAGS
-KDE_USE_FINAL_TRUE
-KDE_USE_FINAL_FALSE
-KDE_USE_CLOSURE_TRUE
-KDE_USE_CLOSURE_FALSE
-KDE_NO_UNDEFINED
-KDE_USE_NMCHECK_TRUE
-KDE_USE_NMCHECK_FALSE
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-KDE_PLUGIN
-KDE_CHECK_PLUGIN
-INSTALL_LTDL_TRUE
-INSTALL_LTDL_FALSE
-CONVENIENCE_LTDL_TRUE
-CONVENIENCE_LTDL_FALSE
-LIBADD_DL
-MSGFMT
-GMSGFMT
-XGETTEXT
-ALLOCA
-ACL_LIBS
-LIBUTIL
-LIBCOMPAT
-LIBCRYPT
-LIBRESOLV
-LIB_POLL
-FRAMEWORK_COREAUDIO
-LIBSOCKET
-X_EXTRA_LIBS
-LIBUCB
-LIBDL
-KDE_USE_FPIE
-KDE_USE_PIE
-include_x11_TRUE
-include_x11_FALSE
-XMKMF
-X_PRE_LIBS
-LIB_X11
-LIB_XRENDER
-LIBSM
-X_INCLUDES
-X_LDFLAGS
-x_includes
-x_libraries
-QTE_NORTTI
-LIB_XEXT
-PKG_CONFIG
-LIBPTHREAD
-USE_THREADS
-KDE_MT_LDFLAGS
-KDE_MT_LIBS
-USER_INCLUDES
-USER_LDFLAGS
-LIBZ
-LIBPNG
-LIBJPEG
-qt_libraries
-qt_includes
-QT_INCLUDES
-QT_LDFLAGS
-PERL
-MOC
-UIC
-UIC_TR
-LIB_QT
-LIB_QPE
-kde_qtver
-KDE_EXTRA_RPATH
-KDE_RPATH
-X_RPATH
-kde_libraries
-kde_includes
-KDE_LDFLAGS
-KDE_INCLUDES
-all_includes
-all_libraries
-AUTODIRS
-include_ARTS_TRUE
-include_ARTS_FALSE
-MAKEKDEWIDGETS
-KCONFIG_COMPILER
-KCFG_DEPENDENCIES
-DCOPIDLNG
-DCOPIDL
-DCOPIDL2CPP
-DCOP_DEPENDENCIES
-MCOPIDL
-ARTSCCONFIG
-MEINPROC
-KDE_XSL_STYLESHEET
-XMLLINT
-kde_htmldir
-kde_appsdir
-kde_icondir
-kde_sounddir
-kde_datadir
-kde_locale
-kde_confdir
-kde_kcfgdir
-kde_mimedir
-kde_wallpaperdir
-kde_bindir
-xdg_appsdir
-xdg_menudir
-xdg_directorydir
-kde_templatesdir
-kde_servicesdir
-kde_servicetypesdir
-kde_moduledir
-kdeinitdir
-kde_styledir
-kde_widgetdir
-LIB_KDED
-LIB_KDECORE
-LIB_KDEUI
-LIB_KIO
-LIB_KJS
-LIB_SMB
-LIB_KAB
-LIB_KABC
-LIB_KHTML
-LIB_KSPELL
-LIB_KPARTS
-LIB_KDEPRINT
-LIB_KUTILS
-LIB_KDEPIM
-LIB_KIMPROXY
-LIB_KNEWSTUFF
-LIB_KDNSSD
-LIB_KUNITTEST
-LIB_KSYCOCA
-LIB_KFILE
-LIB_KFM
-QNAMESPACE_H
-LIBICE
-LIB_KIMGIO
-EXTRA_SUBDIRS
-HAVE_SENDFILE
-HAVE_MITSHM
-ICE_SUBDIR
-ICE_RLIB
-LIBUTEMPTER
-QTDOCDIR
-KDE_HAVE_DOT
-DOXYGEN
-DOXYGEN_PROJECT_NAME
-DOXYGEN_PROJECT_NUMBER
-KDE_HAS_DOXYGEN
-include_VERSION_SCRIPT_TRUE
-include_VERSION_SCRIPT_FALSE
-MD5SUM
-LIB_DNSSD
-HAVE_DNSSD_TRUE
-HAVE_DNSSD_FALSE
-LUA
-LUA_INCLUDES
-LUA_LIBS
-LIB_IDN
-LIBART_LIBS
-LIBART_CFLAGS
-LIBART_RPATH
-include_SVGICONS_TRUE
-include_SVGICONS_FALSE
-KDE_FORCE_INLINE
-kde_cups_config
-include_cups_SUBDIR_TRUE
-include_cups_SUBDIR_FALSE
-LIB_CUPS
-cups_modeldir
-path_su
-path_sudo
-LIBBZ2
-include_BZIP2_TRUE
-include_BZIP2_FALSE
-LIBXSLT_LIBS
-LIBXSLT_CFLAGS
-LIBXSLT_RPATH
-LIBXML_LIBS
-LIBXML_CFLAGS
-LIBXML_RPATH
-HELP_SUBDIR
-MEINPROC_DEP
-DOJAVA_TRUE
-DOJAVA_FALSE
-LIBTHAI
-KJAVA_POLICYPATH
-LIBTIFF
-LIB_JASPER
-LIB_EXR
-EXR_FLAGS
-include_TIFF_MODULES_TRUE
-include_TIFF_MODULES_FALSE
-include_JP2_MODULES_TRUE
-include_JP2_MODULES_FALSE
-include_EXR_MODULES_TRUE
-include_EXR_MODULES_FALSE
-KDEINIT_XFT_INCLUDES
-KDEINIT_SETUID
-LIBFAM
-LIBVOLMGT
-SSL_INCLUDES
-SSL_LDFLAGS
-LIBSSL
-include_bzip2_TRUE
-include_bzip2_FALSE
-GSSAPI_INCS
-GSSAPI_LIBS
-GSSAPI_RPATH
-LIBPCRE
-PCRECFLAGS
-include_aspell_plugin_TRUE
-include_aspell_plugin_FALSE
-include_hspell_plugin_TRUE
-include_hspell_plugin_FALSE
-LIBASOUND
-undefined_symbols_allowed_TRUE
-undefined_symbols_allowed_FALSE
-TOPSUBDIRS
-dcop_SUBDIR_included_TRUE
-dcop_SUBDIR_included_FALSE
-libltdl_SUBDIR_included_TRUE
-libltdl_SUBDIR_included_FALSE
-kdefx_SUBDIR_included_TRUE
-kdefx_SUBDIR_included_FALSE
-kdecore_SUBDIR_included_TRUE
-kdecore_SUBDIR_included_FALSE
-kunittest_SUBDIR_included_TRUE
-kunittest_SUBDIR_included_FALSE
-kdeui_SUBDIR_included_TRUE
-kdeui_SUBDIR_included_FALSE
-kdesu_SUBDIR_included_TRUE
-kdesu_SUBDIR_included_FALSE
-kjs_SUBDIR_included_TRUE
-kjs_SUBDIR_included_FALSE
-kwallet_SUBDIR_included_TRUE
-kwallet_SUBDIR_included_FALSE
-kio_SUBDIR_included_TRUE
-kio_SUBDIR_included_FALSE
-arts_SUBDIR_included_TRUE
-arts_SUBDIR_included_FALSE
-dnssd_SUBDIR_included_TRUE
-dnssd_SUBDIR_included_FALSE
-kab_SUBDIR_included_TRUE
-kab_SUBDIR_included_FALSE
-kconf_update_SUBDIR_included_TRUE
-kconf_update_SUBDIR_included_FALSE
-kded_SUBDIR_included_TRUE
-kded_SUBDIR_included_FALSE
-kdoctools_SUBDIR_included_TRUE
-kdoctools_SUBDIR_included_FALSE
-kimgio_SUBDIR_included_TRUE
-kimgio_SUBDIR_included_FALSE
-kioslave_SUBDIR_included_TRUE
-kioslave_SUBDIR_included_FALSE
-knewstuff_SUBDIR_included_TRUE
-knewstuff_SUBDIR_included_FALSE
-kparts_SUBDIR_included_TRUE
-kparts_SUBDIR_included_FALSE
-kresources_SUBDIR_included_TRUE
-kresources_SUBDIR_included_FALSE
-kstyles_SUBDIR_included_TRUE
-kstyles_SUBDIR_included_FALSE
-kutils_SUBDIR_included_TRUE
-kutils_SUBDIR_included_FALSE
-libkmid_SUBDIR_included_TRUE
-libkmid_SUBDIR_included_FALSE
-libkscreensaver_SUBDIR_included_TRUE
-libkscreensaver_SUBDIR_included_FALSE
-licenses_SUBDIR_included_TRUE
-licenses_SUBDIR_included_FALSE
-mimetypes_SUBDIR_included_TRUE
-mimetypes_SUBDIR_included_FALSE
-pics_SUBDIR_included_TRUE
-pics_SUBDIR_included_FALSE
-doc_SUBDIR_included_TRUE
-doc_SUBDIR_included_FALSE
-kcert_SUBDIR_included_TRUE
-kcert_SUBDIR_included_FALSE
-kinit_SUBDIR_included_TRUE
-kinit_SUBDIR_included_FALSE
-kdeprint_SUBDIR_included_TRUE
-kdeprint_SUBDIR_included_FALSE
-kabc_SUBDIR_included_TRUE
-kabc_SUBDIR_included_FALSE
-kspell2_SUBDIR_included_TRUE
-kspell2_SUBDIR_included_FALSE
-kmdi_SUBDIR_included_TRUE
-kmdi_SUBDIR_included_FALSE
-kcmshell_SUBDIR_included_TRUE
-kcmshell_SUBDIR_included_FALSE
-khtml_SUBDIR_included_TRUE
-khtml_SUBDIR_included_FALSE
-interfaces_SUBDIR_included_TRUE
-interfaces_SUBDIR_included_FALSE
-kdewidgets_SUBDIR_included_TRUE
-kdewidgets_SUBDIR_included_FALSE
-kate_SUBDIR_included_TRUE
-kate_SUBDIR_included_FALSE
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
+LIBS
 CPPFLAGS
 CPP
 CXX
@@ -1201,12 +1301,15 @@
 CXXCPP
 F77
 FFLAGS
-XMKMF'
+XMKMF
+PKG_CONFIG'
 
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1305,13 +1408,21 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1324,13 +1435,21 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1521,22 +1640,38 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1556,7 +1691,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1565,16 +1700,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1583,22 +1718,38 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1613,7 +1764,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1629,10 +1780,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1640,12 +1791,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1672,12 +1823,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1726,9 +1877,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1738,25 +1889,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1778,9 +1929,12 @@
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --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
@@ -1815,7 +1969,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
@@ -1880,6 +2033,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.
@@ -1891,15 +2045,17 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1935,7 +2091,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1945,10 +2101,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1959,7 +2115,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1995,7 +2151,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -2030,7 +2186,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -2082,11 +2238,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -2116,9 +2273,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -2133,9 +2290,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -2151,8 +2308,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2194,21 +2351,24 @@
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -2218,16 +2378,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -2241,29 +2401,38 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2273,10 +2442,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2320,8 +2491,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2378,34 +2549,34 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2422,27 +2593,27 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2459,27 +2630,27 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -2507,13 +2678,10 @@
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
 am__api_version='1.10'
@@ -2536,11 +2704,12 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2569,17 +2738,29 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2592,8 +2773,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2607,8 +2788,8 @@
   if test -z "$kde_save_INSTALL_given" ; then
     # OK, user hasn't given any INSTALL, autoconf found one for us
     # now we test, if it supports the -p flag
-    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -p flag to install" >&5
+$as_echo_n "checking for -p flag to install... " >&6; }
     rm -f confinst.$$.* > /dev/null 2>&1
     echo "Testtest" > confinst.$$.orig
     ac_res=no
@@ -2620,8 +2801,8 @@
       fi
     fi
     rm -f confinst.$$.*
-    { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   fi
 
   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
@@ -2631,8 +2812,8 @@
     INSTALL_SCRIPT='${INSTALL}'
   fi
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -2655,9 +2836,9 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -2668,14 +2849,14 @@
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
@@ -2685,15 +2866,15 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ 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; }
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2728,8 +2909,8 @@
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -2741,10 +2922,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2757,7 +2938,7 @@
   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_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2768,22 +2949,23 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2800,12 +2982,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2824,8 +3006,8 @@
   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;}
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -2841,7 +3023,7 @@
 
 
 # Define the identity of the package.
- PACKAGE=kdelibs
+ PACKAGE=kdelibs.dfsg.1
  VERSION="3.5.10"
 
 
@@ -2880,10 +3062,10 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2896,7 +3078,7 @@
   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_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2907,11 +3089,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2920,10 +3102,10 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2936,7 +3118,7 @@
   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_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2947,11 +3129,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2959,12 +3141,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2988,6 +3166,29 @@
 
 
 
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&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
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$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:
@@ -3001,11 +3202,12 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3034,17 +3236,29 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3057,8 +3271,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3083,8 +3297,8 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3111,8 +3325,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3218,10 +3432,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3234,7 +3448,7 @@
   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_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3245,11 +3459,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3258,10 +3472,10 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3274,7 +3488,7 @@
   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_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3285,11 +3499,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3297,12 +3511,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3315,10 +3525,10 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3331,7 +3541,7 @@
   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_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3342,11 +3552,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3355,10 +3565,10 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3376,7 +3586,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3399,11 +3609,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3414,10 +3624,10 @@
   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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3430,7 +3640,7 @@
   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_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3441,11 +3651,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3458,10 +3668,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3474,7 +3684,7 @@
   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_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3485,11 +3695,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3501,12 +3711,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3516,44 +3722,50 @@
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3572,27 +3784,22 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3603,10 +3810,11 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3617,7 +3825,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -3644,25 +3852,27 @@
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3671,49 +3881,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3722,31 +3936,33 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3769,40 +3985,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3828,20 +4047,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3851,15 +4071,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3886,20 +4110,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3924,20 +4149,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3963,20 +4189,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3991,8 +4218,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4008,10 +4235,10 @@
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4082,20 +4309,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4111,15 +4339,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -4131,10 +4359,10 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -4222,8 +4450,8 @@
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4243,15 +4471,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4283,20 +4511,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4320,13 +4549,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4334,7 +4564,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4359,8 +4589,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4388,20 +4618,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4425,13 +4656,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4439,7 +4671,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4455,11 +4687,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4511,10 +4745,10 @@
   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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4527,7 +4761,7 @@
   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_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4538,11 +4772,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4555,10 +4789,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -4571,7 +4805,7 @@
   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_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4582,11 +4816,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4598,12 +4832,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -4613,43 +4843,47 @@
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4675,20 +4909,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -4698,15 +4933,19 @@
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -4733,20 +4972,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -4771,20 +5011,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -4810,20 +5051,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4838,8 +5080,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -4863,10 +5105,10 @@
 
 depcc="$CXX"  am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -4954,8 +5196,8 @@
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -4971,8 +5213,8 @@
 
 
 
-  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+$as_echo_n "checking whether $CC is blacklisted... " >&6; }
 
 
   cat >conftest.$ac_ext <<_ACEOF
@@ -5002,20 +5244,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_bad_compiler=yes
@@ -5024,11 +5267,11 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-echo "${ECHO_T}$kde_bad_compiler" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+$as_echo "$kde_bad_compiler" >&6; }
 
 if test "$kde_bad_compiler" = "yes"; then
-  { { echo "$as_me:$LINENO: error:
+  { { $as_echo "$as_me:$LINENO: error:
 
 This particular compiler version is blacklisted because it
 is known to miscompile KDE. Please use a newer version, or
@@ -5039,7 +5282,7 @@
 it by intention to avoid untraceable bugs or crashes in KDE.
 
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 
 This particular compiler version is blacklisted because it
 is known to miscompile KDE. Please use a newer version, or
@@ -5067,11 +5310,11 @@
         fi
       fi
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+$as_echo_n "checking whether $CXX supports -fno-builtin... " >&6; }
 kde_cache=`echo fno-builtin | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5109,26 +5352,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5142,24 +5389,24 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="-fno-builtin $CXXFLAGS"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+$as_echo_n "checking whether $CXX supports -Woverloaded-virtual... " >&6; }
 kde_cache=`echo Woverloaded-virtual | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5195,26 +5442,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5228,13 +5479,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
  WOVERLOADED_VRITUAL=""
 fi
@@ -5255,11 +5506,11 @@
 
   if test "$kde_use_profiling" = "yes"; then
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+$as_echo_n "checking whether $CXX supports -pg... " >&6; }
 kde_cache=`echo pg | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5295,26 +5546,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5328,16 +5583,16 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
 
       CFLAGS="-pg $CFLAGS"
       CXXFLAGS="-pg $CXXFLAGS"
 
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -5352,11 +5607,11 @@
             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking whether $CXX supports -Wmissing-format-attribute... " >&6; }
 kde_cache=`echo Wmissing-format-attribute | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5392,26 +5647,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5425,23 +5684,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking whether $CC supports -Wmissing-format-attribute... " >&6; }
 kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5474,26 +5733,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cc_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
@@ -5507,13 +5770,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -5521,11 +5784,11 @@
           ;;
         esac
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+$as_echo_n "checking whether $CXX supports -Wundef... " >&6; }
 kde_cache=`echo Wundef | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5561,26 +5824,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5594,23 +5861,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="-Wundef $CXXFLAGS"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+$as_echo_n "checking whether $CXX supports -Wno-long-long... " >&6; }
 kde_cache=`echo Wno-long-long | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5646,26 +5913,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5679,23 +5950,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="-Wno-long-long $CXXFLAGS"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+$as_echo_n "checking whether $CXX supports -Wno-non-virtual-dtor... " >&6; }
 kde_cache=`echo Wno-non-virtual-dtor | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5731,26 +6002,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5764,13 +6039,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -5796,11 +6071,11 @@
   if test "$GXX" = "yes"; then
     gcc_no_reorder_blocks=NO
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+$as_echo_n "checking whether $CXX supports -fno-reorder-blocks... " >&6; }
 kde_cache=`echo fno-reorder-blocks | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5836,26 +6111,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5869,13 +6148,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  gcc_no_reorder_blocks=YES
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -5887,11 +6166,11 @@
           CFLAGS="$CFLAGS -fno-reorder-blocks"
     fi
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+$as_echo_n "checking whether $CXX supports -fno-exceptions... " >&6; }
 kde_cache=`echo fno-exceptions | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -5927,26 +6206,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5960,23 +6243,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-exceptions"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+$as_echo_n "checking whether $CXX supports -fno-check-new... " >&6; }
 kde_cache=`echo fno-check-new | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6012,26 +6295,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6045,23 +6332,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-check-new"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+$as_echo_n "checking whether $CXX supports -fno-common... " >&6; }
 kde_cache=`echo fno-common | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6097,26 +6384,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6130,23 +6421,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-common"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+$as_echo_n "checking whether $CXX supports -fexceptions... " >&6; }
 kde_cache=`echo fexceptions | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6182,26 +6473,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6215,13 +6510,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  USE_EXCEPTIONS="-fexceptions"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
  USE_EXCEPTIONS=
 fi
@@ -6229,39 +6524,39 @@
     ENABLE_PERMISSIVE_FLAG="-fpermissive"
 
     if test "$kde_use_pch" = "yes"; then
-        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+$as_echo_n "checking whether gcc supports precompiling c header files... " >&6; }
         echo >conftest.h
         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
             kde_gcc_supports_pch=yes
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         else
             kde_gcc_supports_pch=no
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         fi
         if test "$kde_gcc_supports_pch" = "yes"; then
-            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+$as_echo_n "checking whether gcc supports precompiling c++ header files... " >&6; }
             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
                 kde_gcc_supports_pch=yes
-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
             else
                 kde_gcc_supports_pch=no
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
             fi
         fi
         rm -f conftest.h conftest.h.gch
     fi
 
 
-  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+$as_echo_n "checking whether system headers can cope with -O2 -fno-inline... " >&6; }
 if test "${kde_cv_opt_noinline_match+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   kde_cv_opt_noinline_match=irrelevant
@@ -6296,27 +6591,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_cv_opt_noinline_match=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_opt_noinline_match=no
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -6324,8 +6623,8 @@
   fi
 
 fi
-{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+$as_echo "$kde_cv_opt_noinline_match" >&6; }
 
     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
@@ -6343,11 +6642,11 @@
 
     if test "$kde_use_pch" = "yes"; then
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+$as_echo_n "checking whether $CXX supports --pch... " >&6; }
 kde_cache=`echo -pch | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6383,26 +6682,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6416,24 +6719,24 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --pch"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
                                               fi
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+$as_echo_n "checking whether $CXX supports --inline_keyword_space_time=6... " >&6; }
 kde_cache=`echo -inline_keyword_space_time=6 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6469,26 +6772,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6502,23 +6809,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+$as_echo_n "checking whether $CXX supports --inline_auto_space_time=2... " >&6; }
 kde_cache=`echo -inline_auto_space_time=2 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6554,26 +6861,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6587,23 +6898,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+$as_echo_n "checking whether $CXX supports --inline_implicit_space_time=2.0... " >&6; }
 kde_cache=`echo -inline_implicit_space_time=2.0 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6639,26 +6950,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6672,23 +6987,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+$as_echo_n "checking whether $CXX supports --inline_generated_space_time=2.0... " >&6; }
 kde_cache=`echo -inline_generated_space_time=2.0 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6724,26 +7039,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6757,23 +7076,23 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+$as_echo_n "checking whether $CXX supports --one_per... " >&6; }
 kde_cache=`echo -one_per | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -6809,26 +7128,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6842,13 +7165,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --one_per"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -6866,8 +7189,8 @@
         if test "$GXX" = yes; then
           libstdcpp=`$CXX -print-file-name=libstdc++.so`
           if test ! -f $libstdcpp; then
-             { { echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
-echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
+             { { $as_echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
+$as_echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
    { (exit 1); exit 1; }; }
           fi
         fi
@@ -6883,8 +7206,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
+        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
+$as_echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -6902,8 +7225,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
+        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
+$as_echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -6922,8 +7245,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
+        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
+$as_echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -6941,8 +7264,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
+        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
+$as_echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -6960,11 +7283,11 @@
 ac_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; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -6996,20 +7319,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7033,13 +7357,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
@@ -7047,7 +7372,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7072,8 +7397,8 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -7101,20 +7426,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7138,13 +7464,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
@@ -7152,7 +7479,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7168,11 +7495,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -7186,11 +7515,11 @@
      NOOPT_CFLAGS=-O0
   fi
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+$as_echo_n "checking whether $CXX supports -O0... " >&6; }
 kde_cache=`echo O0 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -7226,26 +7555,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7259,13 +7592,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  NOOPT_CXXFLAGS=-O0
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -7281,8 +7614,8 @@
         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
         ac_coverage_linker=""
       else
-        { { echo "$as_me:$LINENO: error: coverage with your compiler is not supported" >&5
-echo "$as_me: error: coverage with your compiler is not supported" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: coverage with your compiler is not supported" >&5
+$as_echo "$as_me: error: coverage with your compiler is not supported" >&2;}
    { (exit 1); exit 1; }; }
       fi
       CFLAGS="$CFLAGS $ac_coverage_compiler"
@@ -7310,11 +7643,11 @@
   if test "x$kde_use_new_ldflags" = "xyes"; then
        LDFLAGS_NEW_DTAGS=""
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+$as_echo_n "checking whether $CXX supports -Wl,--enable-new-dtags... " >&6; }
 kde_cache=`echo Wl,--enable-new-dtags | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -7350,26 +7683,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7383,24 +7720,24 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+$as_echo_n "checking whether $CXX supports -Wl,--as-needed... " >&6; }
 kde_cache=`echo Wl,--as-needed | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -7436,26 +7773,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7469,13 +7810,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -7521,217 +7862,44 @@
        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
-
+  fi
 
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 
 
-  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); } && {
-	 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"
+  # Check whether --enable-nmcheck was given.
+if test "${enable_nmcheck+set}" = set; then
+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  kde_use_nmcheck=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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 test "$kde_use_nmcheck" = "yes"; then
+      KDE_USE_NMCHECK_TRUE=""
+      KDE_USE_NMCHECK_FALSE="#"
+   else
+      KDE_USE_NMCHECK_TRUE="#"
+      KDE_USE_NMCHECK_FALSE=""
+  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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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
-
-
-
-
-
-  # Check whether --enable-nmcheck was given.
-if test "${enable_nmcheck+set}" = set; then
-  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
-else
-  kde_use_nmcheck=no
-fi
-
-
-  if test "$kde_use_nmcheck" = "yes"; then
-      KDE_USE_NMCHECK_TRUE=""
-      KDE_USE_NMCHECK_FALSE="#"
-   else
-      KDE_USE_NMCHECK_TRUE="#"
-      KDE_USE_NMCHECK_FALSE=""
-  fi
-
-
-
-
-
-
-  case $enable_ltdl_convenience in
-  no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
-echo "$as_me: error: this package needs a convenience libltdl" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/''libltdl'
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
+  case $enable_ltdl_convenience in
+  no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+$as_echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/''libltdl'
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
 
 
 # Check whether --enable-shared was given.
@@ -7812,8 +7980,8 @@
        kdelibsuff=
     fi
     if test -z "$kdelibsuff"; then
-        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
-echo "${ECHO_T}not using lib directory suffix" >&6; }
+        { $as_echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+$as_echo "not using lib directory suffix" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define KDELIBSUFF ""
@@ -7829,8 +7997,8 @@
 #define KDELIBSUFF "${kdelibsuff}"
 _ACEOF
 
-        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+        { $as_echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+$as_echo "using lib directory suffix $kdelibsuff" >&6; }
     fi
 
 # Check whether --enable-fast-install was given.
@@ -7857,10 +8025,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -7871,18 +8039,19 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # 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
@@ -7911,45 +8080,41 @@
 fi
 
 SED=$lt_cv_path_SED
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    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_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
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -7964,74 +8129,60 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    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_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
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -8046,33 +8197,24 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -8087,8 +8229,8 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -8117,14 +8259,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -8134,7 +8276,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'*)
@@ -8154,21 +8296,21 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&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
@@ -8178,88 +8320,104 @@
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+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; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # 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
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -8284,44 +8442,42 @@
   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',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 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.*`
       ;;
@@ -8337,7 +8493,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
@@ -8353,43 +8509,27 @@
   esac
   ;;
 
+interix[3-9]*)
+  # 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
@@ -8408,32 +8548,26 @@
   ;;
 
 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*)
+rdos*)
   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]'
@@ -8454,17 +8588,20 @@
   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
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -8473,6 +8610,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
 
@@ -8492,7 +8632,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -8507,11 +8647,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8510 "configure"' > conftest.$ac_ext
+  echo '#line 8650 "configure"' > 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -8542,22 +8682,25 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # 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
+  $as_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-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -8569,8 +8712,10 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -8594,10 +8739,10 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8626,26 +8771,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -8655,13 +8804,33 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+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=$?
+  $as_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
 
@@ -8669,10 +8838,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8699,20 +8868,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -8804,37 +8974,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8856,11 +9029,11 @@
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8878,20 +9051,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -8899,12 +9073,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8915,20 +9092,21 @@
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8944,32 +9122,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8983,74 +9162,317 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+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
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # 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
+  # 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_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
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+  $as_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
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_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'
@@ -9061,10 +9483,10 @@
   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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -9077,7 +9499,7 @@
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9088,11 +9510,11 @@
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9105,10 +9527,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -9121,7 +9543,7 @@
   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_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9132,11 +9554,11 @@
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9148,12 +9570,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     F77=$ac_ct_F77
@@ -9162,37 +9580,41 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -9200,10 +9622,10 @@
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -9219,20 +9641,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -9242,16 +9665,16 @@
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -9265,20 +9688,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -9287,8 +9711,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -9305,7 +9729,11 @@
   fi
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+  G77=yes
+else
+  G77=
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9317,13 +9745,13 @@
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -9352,45 +9780,99 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
-    # 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` &&
-	    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
-    done
-    testring=
-    # 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.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+  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
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      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`
+    else
+      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`
+        teststring=$teststring$teststring
+      done
+      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.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -9402,9 +9884,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'"
 
@@ -9426,14 +9905,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]'
@@ -9451,14 +9946,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
@@ -9479,14 +9977,14 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -9541,7 +10039,7 @@
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -9576,17 +10074,17 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -9598,8 +10096,8 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -9620,7 +10118,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.
@@ -9640,7 +10138,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"
@@ -9650,10 +10148,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -9666,7 +10164,7 @@
   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_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9677,11 +10175,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9690,10 +10188,10 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -9706,7 +10204,7 @@
   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_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9717,11 +10215,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -9729,12 +10227,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -9746,10 +10240,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -9762,7 +10256,7 @@
   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_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9773,11 +10267,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9786,10 +10280,10 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -9802,7 +10296,7 @@
   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_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9813,11 +10307,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -9825,12 +10319,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -9842,10 +10332,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -9858,7 +10348,7 @@
   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_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9869,11 +10359,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9882,10 +10372,10 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -9898,7 +10388,7 @@
   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_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9909,11 +10399,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -9921,12 +10411,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -9945,6 +10431,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"
@@ -9957,30 +10444,41 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 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*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -9998,7 +10496,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
@@ -10030,19 +10528,19 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -10060,7 +10558,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
@@ -10092,11 +10590,11 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -10146,77 +10644,34 @@
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # 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
+echo "$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
+echo "$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:
@@ -10230,14 +10685,14 @@
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -10245,26 +10700,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:10251: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10706: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10255: \$? = $ac_status" >&5
+   echo "$as_me:10710: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -10278,8 +10735,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -10301,13 +10758,15 @@
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -10317,6 +10776,11 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    interix[3-9]*)
+      # 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.
@@ -10333,7 +10797,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
 	;;
@@ -10359,8 +10823,18 @@
 	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*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -10370,7 +10844,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
 	;;
@@ -10393,18 +10867,41 @@
       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.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -10414,15 +10911,19 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
       ;;
 
     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*)
@@ -10431,7 +10932,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'
@@ -10444,33 +10945,44 @@
       fi
       ;;
 
-    uts4*)
-      lt_prog_compiler_pic='-pic'
+    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
       ;;
-    esac
-  fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -10478,26 +10990,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:10484: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10996: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10488: \$? = $ac_status" >&5
+   echo "$as_me:11000: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+$as_echo "$lt_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -10510,7 +11024,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=
@@ -10520,24 +11034,59 @@
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$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
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+$as_echo "$lt_prog_compiler_static_works" >&6; }
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -10545,58 +11094,63 @@
    # 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:10551: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11100: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10555: \$? = $ac_status" >&5
+   echo "$as_me:11104: \$? = $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*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -10634,6 +11188,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*)
@@ -10644,6 +11208,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
     ;;
@@ -10654,6 +11222,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*)
@@ -10691,7 +11280,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
@@ -10701,13 +11290,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/'\'' -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
@@ -10716,23 +11305,79 @@
 	  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
+      ;;
+
+    interix[3-9]*)
+      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'
+      ;;
+
+    gnu* | 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
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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
@@ -10746,13 +11391,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=
@@ -10762,24 +11434,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)
@@ -10791,7 +11458,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
@@ -10813,9 +11480,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
@@ -10832,7 +11511,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`
@@ -10840,7 +11519,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -10851,8 +11530,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
@@ -10860,22 +11543,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
@@ -10896,43 +11580,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -10956,31 +11650,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -10990,13 +11695,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
       ;;
@@ -11009,7 +11712,7 @@
       ld_shlibs=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -11019,68 +11722,68 @@
       # 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.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
 
     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` $xlcverstring'
+         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 $xlcverstring~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
       ;;
 
@@ -11114,8 +11817,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
@@ -11123,7 +11826,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
@@ -11137,47 +11840,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 $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$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='${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*)
+	  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 $compiler_flags $libobjs $deplibs'
+	  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*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	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_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
 	  hardcode_direct=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
@@ -11191,7 +11909,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'
@@ -11201,7 +11919,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
@@ -11221,23 +11939,28 @@
       ;;
 
     openbsd*)
-      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'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	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 $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
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -11245,14 +11968,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'
@@ -11264,13 +11987,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'
@@ -11278,21 +12001,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'
@@ -11301,8 +12018,17 @@
       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 and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -11311,7 +12037,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
@@ -11359,36 +12085,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* | sco3.2v5.0.[024]*)
+      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*)
@@ -11403,15 +12138,10 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$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?
 #
@@ -11429,21 +12159,22 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -11454,7 +12185,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -11466,20 +12197,20 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -11489,7 +12220,58 @@
 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
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_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.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -11554,7 +12336,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*)
@@ -11563,7 +12345,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}'
@@ -11579,7 +12361,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -11591,7 +12373,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'
@@ -11621,7 +12404,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
     ;;
@@ -11644,13 +12427,9 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -11667,20 +12446,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*)
@@ -11698,14 +12474,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
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -11725,9 +12506,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
@@ -11742,7 +12523,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
@@ -11753,7 +12534,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
@@ -11765,6 +12546,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix[3-9]*)
+  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 ;;
@@ -11808,29 +12601,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;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,
@@ -11840,6 +12630,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
@@ -11849,7 +12651,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
@@ -11877,8 +12679,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
@@ -11898,7 +12705,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'
@@ -11916,11 +12723,8 @@
   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
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
@@ -11948,7 +12752,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'
@@ -11981,6 +12785,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}'
@@ -11992,16 +12819,21 @@
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&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 &&
@@ -12021,8 +12853,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -12035,29 +12867,30 @@
 
 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; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&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; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "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; }
+         old_striplib="$STRIP -S"
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -12089,10 +12922,10 @@
 
   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; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -12124,33 +12957,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -12163,10 +13000,10 @@
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12219,38 +13056,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""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; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12282,39 +13123,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""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; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12367,38 +13212,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""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; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -12430,39 +13279,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""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; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -12494,39 +13347,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""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; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12558,33 +13415,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
 
@@ -12618,15 +13479,15 @@
     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"
 
-    { 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; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -12634,7 +13495,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12637 "configure"
+#line 13498 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12691,6 +13552,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -12698,14 +13561,14 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_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
@@ -12716,15 +13579,15 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -12732,7 +13595,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12735 "configure"
+#line 13598 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12789,6 +13652,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -12796,14 +13661,14 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_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
@@ -12814,8 +13679,8 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -12836,19 +13701,19 @@
 fi
 
 
-# Report which librarie types wil actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+# Report which library types will actually be built
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -12857,58 +13722,21 @@
   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
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -12923,7 +13751,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 \
@@ -12964,6 +13793,7 @@
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -12998,8 +13828,8 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -13008,7 +13838,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -13037,11 +13867,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=
@@ -13071,6 +13901,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
@@ -13082,6 +13918,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler
 
@@ -13101,7 +13940,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
@@ -13132,7 +13971,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -13147,7 +13986,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?
@@ -13323,7 +14162,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -13374,7 +14213,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
 
 
@@ -13395,20 +14237,23 @@
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_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.
@@ -13420,16 +14265,16 @@
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -13439,7 +14284,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'
@@ -13459,6 +14306,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=
@@ -13476,27 +14324,44 @@
 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
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # 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); }'
 
 # 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
+echo "$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
+echo "$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
@@ -13507,18 +14372,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
@@ -13542,8 +14416,8 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -13572,14 +14446,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -13589,7 +14463,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'*)
@@ -13609,21 +14483,21 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&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
@@ -13633,8 +14507,8 @@
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -13642,8 +14516,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'
@@ -13669,7 +14543,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
@@ -13684,8 +14558,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -13700,8 +14574,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
@@ -13718,7 +14607,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`
@@ -13726,7 +14615,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -13737,8 +14626,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
@@ -13747,15 +14640,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.
@@ -13782,44 +14676,54 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -13843,31 +14747,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -13877,16 +14792,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
       *)
@@ -13900,12 +14825,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
@@ -13914,70 +14839,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` $xlcverstring'
+          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 $xlcverstring~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
@@ -13988,14 +14924,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
@@ -14012,12 +14948,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.
@@ -14026,11 +14962,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
@@ -14040,33 +14976,20 @@
     ;;
   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_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=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
       *)
-	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
@@ -14077,17 +15000,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
@@ -14103,12 +15029,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
@@ -14119,11 +15048,25 @@
 	;;
     esac
     ;;
+  interix[3-9]*)
+    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
@@ -14134,9 +15077,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
@@ -14145,16 +15088,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.
@@ -14172,20 +15115,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'
@@ -14201,6 +15168,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  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
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -14213,7 +15203,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -14223,7 +15213,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=
@@ -14234,15 +15224,35 @@
     # 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*)
+    if test -f /usr/libexec/ld.so; then
+      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'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
   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=:
@@ -14252,14 +15262,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=:
@@ -14277,7 +15287,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=:
@@ -14296,13 +15306,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=:
@@ -14311,17 +15321,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'
@@ -14340,7 +15350,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=:
@@ -14361,27 +15371,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
@@ -14394,36 +15391,28 @@
     ;;
   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.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # 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='-z allextract$convenience -z 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
@@ -14431,9 +15420,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'
@@ -14443,9 +15432,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
@@ -14454,9 +15443,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
@@ -14465,16 +15454,73 @@
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     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
@@ -14494,8 +15540,8 @@
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -14519,7 +15565,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -14531,7 +15577,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
@@ -14571,7 +15617,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
@@ -14607,6 +15653,62 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # 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=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # 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.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -14615,8 +15717,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -14637,12 +15739,14 @@
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -14654,6 +15758,10 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    interix[3-9]*)
+      # 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
@@ -14662,7 +15770,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*)
 	;;
       *)
@@ -14687,18 +15795,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'
 	    ;;
@@ -14706,22 +15824,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
 	      ;;
@@ -14734,9 +15852,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.
@@ -14745,20 +15867,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.
@@ -14766,6 +15894,14 @@
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -14775,25 +15911,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
@@ -14807,24 +15943,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'
 	    ;;
@@ -14834,12 +15961,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'
 	    ;;
@@ -14849,7 +15976,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -14857,7 +15984,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*)
 	;;
@@ -14867,22 +16001,22 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -14890,26 +16024,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:14896: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14900: \$? = $ac_status" >&5
+   echo "$as_me:16034: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -14922,7 +16058,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=
@@ -14932,24 +16068,59 @@
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+#
+# 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\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$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
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+$as_echo "$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
+
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14957,58 +16128,63 @@
    # 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:14963: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16134: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14967: \$? = $ac_status" >&5
+   echo "$as_me:16138: \$? = $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*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -15025,22 +16201,20 @@
     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'
   ;;
   esac
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$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?
 #
@@ -15058,21 +16232,22 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -15083,7 +16258,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -15095,20 +16270,20 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -15118,7 +16293,7 @@
 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
 
@@ -15183,7 +16358,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*)
@@ -15192,7 +16367,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}'
@@ -15208,7 +16383,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -15220,7 +16395,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'
@@ -15250,7 +16426,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
     ;;
@@ -15273,13 +16449,8 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -15296,20 +16467,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*)
@@ -15327,14 +16495,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
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -15354,9 +16527,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
@@ -15371,7 +16544,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
@@ -15382,7 +16555,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
@@ -15394,6 +16567,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix[3-9]*)
+  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 ;;
@@ -15437,29 +16622,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;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,
@@ -15469,6 +16651,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
@@ -15478,7 +16672,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
@@ -15506,8 +16700,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
@@ -15527,7 +16726,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'
@@ -15545,11 +16744,8 @@
   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
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
@@ -15577,7 +16773,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'
@@ -15610,6 +16806,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}'
@@ -15621,16 +16840,21 @@
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&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 &&
@@ -15650,8 +16874,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -15662,1135 +16886,344 @@
   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 \
+    fix_srcfile_path_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); } && {
-	 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_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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-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); } && {
-	 test -z "$ac_cxx_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
-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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-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); } && {
-	 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_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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-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); } && {
-	 test -z "$ac_cxx_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
-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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-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); } && {
-	 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_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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-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); } && {
-	 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_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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-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); } && {
-	 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_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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-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 16266 "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 16364 "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
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
 
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  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 finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-    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*
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
 
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-    fi
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
 
-  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
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_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 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
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
@@ -16830,7 +17263,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -16856,7 +17289,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
 
 
@@ -16918,39 +17354,72 @@
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # 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
+echo "$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
+echo "$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; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -16958,21 +17427,21 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -16981,8 +17450,8 @@
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -17004,13 +17473,15 @@
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -17020,6 +17491,11 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
+    interix[3-9]*)
+      # 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.
@@ -17036,7 +17512,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
 	;;
@@ -17062,8 +17538,18 @@
 	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*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -17073,7 +17559,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
 	;;
@@ -17096,18 +17582,41 @@
       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.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -17117,15 +17626,19 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
       ;;
 
     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*)
@@ -17134,7 +17647,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'
@@ -17147,6 +17660,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'
@@ -17158,22 +17682,22 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17181,26 +17705,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:17187: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17711: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17191: \$? = $ac_status" >&5
+   echo "$as_me:17715: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -17213,7 +17739,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=
@@ -17223,24 +17749,59 @@
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+#
+# 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\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_prog_compiler_static_works_F77=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$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
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+$as_echo "$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
+
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -17248,58 +17809,63 @@
    # 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:17254: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17815: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17258: \$? = $ac_status" >&5
+   echo "$as_me:17819: \$? = $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*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -17337,6 +17903,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*)
@@ -17347,6 +17923,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
     ;;
@@ -17357,6 +17937,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*)
@@ -17394,7 +17995,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
@@ -17404,13 +18005,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/'\'' -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
@@ -17419,23 +18020,79 @@
 	  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
+      ;;
+
+    interix[3-9]*)
+      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'
+      ;;
+
+    gnu* | 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
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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
@@ -17449,13 +18106,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=
@@ -17465,24 +18149,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)
@@ -17494,7 +18173,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
@@ -17516,9 +18195,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
@@ -17535,7 +18226,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`
@@ -17543,7 +18234,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -17554,8 +18245,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
@@ -17563,22 +18258,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
@@ -17589,43 +18285,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -17639,31 +18345,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -17673,13 +18390,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
       ;;
@@ -17692,7 +18407,7 @@
       ld_shlibs_F77=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -17702,68 +18417,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"`'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      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` $xlcverstring'
+         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 $xlcverstring~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
       ;;
 
@@ -17797,8 +18512,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
@@ -17806,7 +18521,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
@@ -17820,47 +18535,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'
 
@@ -17874,7 +18604,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'
@@ -17884,7 +18614,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
@@ -17904,23 +18634,28 @@
       ;;
 
     openbsd*)
-      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'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	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 $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
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -17928,14 +18663,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'
@@ -17947,13 +18682,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'
@@ -17961,21 +18696,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'
@@ -17984,8 +18713,17 @@
       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 and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -17994,7 +18732,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
@@ -18042,36 +18780,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* | sco3.2v5.0.[024]*)
+      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*)
@@ -18086,15 +18833,10 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$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?
 #
@@ -18112,21 +18854,22 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_F77
+	pic_flag=$lt_prog_compiler_pic_F77
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -18137,7 +18880,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -18149,20 +18892,20 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -18172,7 +18915,7 @@
 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
 
@@ -18237,7 +18980,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*)
@@ -18246,7 +18989,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}'
@@ -18262,7 +19005,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -18274,7 +19017,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'
@@ -18304,7 +19048,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
     ;;
@@ -18327,13 +19071,8 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18350,20 +19089,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*)
@@ -18381,14 +19117,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
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -18408,9 +19149,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
@@ -18425,7 +19166,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
@@ -18436,7 +19177,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
@@ -18448,6 +19189,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix[3-9]*)
+  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 ;;
@@ -18491,29 +19244,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;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,
@@ -18523,6 +19273,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
@@ -18532,7 +19294,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
@@ -18560,8 +19322,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
@@ -18581,7 +19348,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'
@@ -18599,11 +19366,8 @@
   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
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
@@ -18631,7 +19395,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'
@@ -18664,6 +19428,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}'
@@ -18675,16 +19462,21 @@
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&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 &&
@@ -18704,8 +19496,8 @@
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -18716,36 +19508,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
@@ -18760,7 +19522,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 \
@@ -18801,6 +19564,7 @@
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -18860,6 +19624,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
@@ -18871,6 +19641,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_F77
 
@@ -18890,7 +19663,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
@@ -18921,7 +19694,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -18936,7 +19709,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?
@@ -19112,7 +19885,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -19138,7 +19911,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
 
 
@@ -19167,29 +19943,58 @@
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # 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) {}; }'
 
 # 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
+echo "$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
+echo "$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
@@ -19201,14 +20006,14 @@
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -19216,26 +20021,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:19222: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20027: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19226: \$? = $ac_status" >&5
+   echo "$as_me:20031: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -19249,8 +20056,8 @@
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -19272,13 +20079,15 @@
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -19288,6 +20097,11 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
+    interix[3-9]*)
+      # 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.
@@ -19304,7 +20118,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
 	;;
@@ -19330,8 +20144,18 @@
 	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*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -19341,7 +20165,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
 	;;
@@ -19364,18 +20188,41 @@
       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.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -19385,15 +20232,19 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
     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*)
@@ -19402,7 +20253,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'
@@ -19415,6 +20266,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'
@@ -19426,22 +20288,22 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -19449,26 +20311,28 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -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:19455: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20317: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19459: \$? = $ac_status" >&5
+   echo "$as_me:20321: \$? = $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
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -19481,7 +20345,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=
@@ -19491,24 +20355,59 @@
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+#
+# 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\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_prog_compiler_static_works_GCJ=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$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
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+$as_echo "$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
+
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -19516,58 +20415,63 @@
    # 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:19522: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20421: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19526: \$? = $ac_status" >&5
+   echo "$as_me:20425: \$? = $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*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -19605,6 +20509,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*)
@@ -19615,6 +20529,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
     ;;
@@ -19625,6 +20543,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*)
@@ -19662,7 +20601,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
@@ -19672,13 +20611,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/'\'' -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
@@ -19687,23 +20626,79 @@
 	  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
+      ;;
+
+    interix[3-9]*)
+      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'
+      ;;
+
+    gnu* | 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
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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
@@ -19717,13 +20712,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=
@@ -19733,24 +20755,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)
@@ -19762,7 +20779,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
@@ -19784,9 +20801,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
@@ -19803,7 +20832,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`
@@ -19811,7 +20840,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -19822,8 +20851,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
@@ -19831,22 +20864,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
@@ -19867,43 +20901,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -19927,31 +20971,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 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
@@ -19961,13 +21016,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
       ;;
@@ -19980,7 +21033,7 @@
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -19990,68 +21043,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"`'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      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` $xlcverstring'
+         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 $xlcverstring~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
       ;;
 
@@ -20085,8 +21138,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
@@ -20094,7 +21147,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
@@ -20108,47 +21161,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'
 
@@ -20162,7 +21230,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'
@@ -20172,7 +21240,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
@@ -20192,23 +21260,28 @@
       ;;
 
     openbsd*)
-      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'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	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 $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
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -20216,14 +21289,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'
@@ -20235,13 +21308,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'
@@ -20249,21 +21322,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'
@@ -20272,8 +21339,17 @@
       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 and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -20282,7 +21358,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
@@ -20330,36 +21406,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* | sco3.2v5.0.[024]*)
+      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*)
@@ -20374,15 +21459,10 @@
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$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?
 #
@@ -20400,21 +21480,22 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_GCJ
+	pic_flag=$lt_prog_compiler_pic_GCJ
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -20425,7 +21506,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -20437,20 +21518,20 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -20460,7 +21541,7 @@
 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
 
@@ -20525,7 +21606,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*)
@@ -20534,7 +21615,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}'
@@ -20550,7 +21631,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -20562,7 +21643,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'
@@ -20592,7 +21674,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
     ;;
@@ -20615,13 +21697,8 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -20638,20 +21715,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*)
@@ -20669,14 +21743,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
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -20696,9 +21775,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
@@ -20713,7 +21792,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
@@ -20724,7 +21803,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
@@ -20736,6 +21815,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix[3-9]*)
+  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 ;;
@@ -20763,1047 +21854,284 @@
     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
       libsuff=64 shlibsuff=64 libmagic=64-bit;;
     *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    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
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
 
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
 
-fi
+# This must be Linux ELF.
+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'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
+  # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
 
-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,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
 
+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'
+  ;;
 
-fi
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
 
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-fi
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-    ;;
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
   else
-    enable_dlopen=no
+    shlibpath_overrides_runpath=yes
   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 21608 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
-#include <stdio.h>
+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 RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
+rdos*)
+  dynamic_linker=no
+  ;;
 
-/* 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
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  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=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 21706 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
-rm -fr conftest*
 
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&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: $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
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$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
 
 
@@ -21820,7 +22148,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 \
@@ -21861,6 +22190,7 @@
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -21920,6 +22250,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
@@ -21931,6 +22267,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_GCJ
 
@@ -21950,7 +22289,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
@@ -21981,7 +22320,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -21996,7 +22335,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?
@@ -22172,7 +22511,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -22198,7 +22537,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
 
 
@@ -22226,7 +22568,7 @@
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -22236,15 +22578,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
+echo "$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
+echo "$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
@@ -22260,7 +22629,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 \
@@ -22301,6 +22671,7 @@
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -22360,6 +22731,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
@@ -22371,6 +22748,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
@@ -22390,7 +22770,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
@@ -22421,7 +22801,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -22436,7 +22816,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?
@@ -22612,7 +22992,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -22638,7 +23018,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
 
 
@@ -22653,8 +23036,8 @@
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -22673,8 +23056,8 @@
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -22685,7 +23068,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
 
@@ -22772,10 +23155,10 @@
 . ./conftest
 rm -f conftest
 
-{ echo "$as_me:$LINENO: checking which extension is used for shared libraries" >&5
-echo $ECHO_N "checking which extension is used for shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which extension is used for shared libraries" >&5
+$as_echo_n "checking which extension is used for shared libraries... " >&6; }
 if test "${libltdl_cv_shlibext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   (
   last=
@@ -22797,8 +23180,8 @@
 rm -f conftest
 
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
-echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+$as_echo "$libltdl_cv_shlibext" >&6; }
 if test -n "$libltdl_cv_shlibext"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -22807,15 +23190,15 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
+$as_echo_n "checking which variable specifies run-time library path... " >&6; }
 if test "${libltdl_cv_shlibpath_var+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   libltdl_cv_shlibpath_var="$shlibpath_var"
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
+$as_echo "$libltdl_cv_shlibpath_var" >&6; }
 if test -n "$libltdl_cv_shlibpath_var"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -22824,15 +23207,15 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for the default library search path" >&5
-echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for the default library search path" >&5
+$as_echo_n "checking for the default library search path... " >&6; }
 if test "${libltdl_cv_sys_search_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
-echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
+$as_echo "$libltdl_cv_sys_search_path" >&6; }
 if test -n "$libltdl_cv_sys_search_path"; then
   case "$host" in
   *-*-mingw*) pathsep=";" ;;
@@ -22853,10 +23236,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${libltdl_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   libltdl_cv_objdir="$objdir"
 if test -n "$objdir"; then
@@ -22873,8 +23256,8 @@
 rmdir .libs 2>/dev/null
 fi
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
-echo "${ECHO_T}$libltdl_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
+$as_echo "$libltdl_cv_objdir" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define LTDL_OBJDIR "$libltdl_cv_objdir/"
@@ -22882,10 +23265,10 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output" >&5
-echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output" >&5
+$as_echo_n "checking command to parse $NM output... " >&6; }
 if test "${ac_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # These are sane defaults that work on at least a few old systems.
 # {They come from Ultrix.  What could be older than Ultrix?!! ;)}
@@ -22949,7 +23332,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     ac_nlist=conftest.nm
@@ -22957,7 +23340,7 @@
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$ac_nlist"; then
 
       # Try sorting and uniquifying the output.
@@ -23013,7 +23396,7 @@
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
 	    ac_pipe_works=yes
 	  else
@@ -23057,13 +23440,13 @@
 if test -z "$ac_cv_sys_global_symbol_pipe"; then
    ac_result=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_result" >&5
-echo "${ECHO_T}$ac_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_result" >&5
+$as_echo "$ac_result" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
-echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
+$as_echo_n "checking whether libtool supports -dlopen/-dlpreopen... " >&6; }
 if test "${libltdl_cv_preloaded_symbols+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     if test -n "$global_symbol_pipe"; then
     libltdl_cv_preloaded_symbols=yes
@@ -23072,8 +23455,8 @@
   fi
 
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
-echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
+$as_echo "$libltdl_cv_preloaded_symbols" >&6; }
 if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23083,10 +23466,10 @@
 fi
 
 LIBADD_DL=
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -23118,43 +23501,47 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBDL 1
 _ACEOF
  LIBADD_DL="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23207,42 +23594,46 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBDL 1
 _ACEOF
 
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -23274,33 +23665,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBDL 1
@@ -23313,10 +23708,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23369,42 +23764,46 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SHL_LOAD 1
 _ACEOF
 
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -23436,33 +23835,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SHL_LOAD 1
@@ -23474,10 +23877,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -23509,33 +23912,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLD 1
@@ -23551,11 +23958,11 @@
 
 for ac_func in dlerror
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23608,35 +24015,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -23645,10 +24059,10 @@
  LIBS="$LIBS_SAVE"
 fi
 
-{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
-echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
+$as_echo_n "checking for _ prefix in compiled symbols... " >&6; }
 if test "${ac_cv_sys_symbol_underscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_symbol_underscore=no
 cat > conftest.$ac_ext <<EOF
@@ -23658,14 +24072,14 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
   if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$ac_nlist"; then
     # See whether the symbols have a leading underscore.
     if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
@@ -23688,16 +24102,16 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
-echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
+$as_echo "$ac_cv_sys_symbol_underscore" >&6; }
 
 if test x"$ac_cv_sys_symbol_underscore" = xyes; then
   if test x"$ac_cv_func_dlopen" = xyes ||
      test x"$ac_cv_lib_dl_dlopen" = xyes ; then
-	{ echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
-echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
+$as_echo_n "checking whether we have to add an underscore for dlsym... " >&6; }
 if test "${libltdl_cv_need_uscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   		if test "$cross_compiling" = yes; then
   libltdl_cv_need_uscore=cross
@@ -23761,36 +24175,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   libltdl_cv_need_uscore=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 libltdl_cv_need_uscore=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
-echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+$as_echo "$libltdl_cv_need_uscore" >&6; }
   fi
 fi
 
@@ -23808,10 +24225,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
-echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
+$as_echo_n "checking whether deplibs are loaded by dlopen... " >&6; }
 if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	# PORTME does your system automatically load deplibs for dlopen()?
 	libltdl_cv_sys_dlopen_deplibs=unknown
@@ -23840,8 +24257,8 @@
 	esac
 
 fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
-echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
+$as_echo "$libltdl_cv_sys_dlopen_deplibs" >&6; }
 if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23861,20 +24278,21 @@
 
 for ac_header in malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h dld.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23890,32 +24308,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23929,69 +24348,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -24002,20 +24425,21 @@
 
 for ac_header in string.h strings.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24031,32 +24455,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24070,69 +24495,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -24143,11 +24572,11 @@
 
 for ac_func in strchr index
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24200,35 +24629,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -24238,11 +24674,11 @@
 
 for ac_func in strrchr rindex
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24295,35 +24731,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -24333,11 +24776,11 @@
 
 for ac_func in memcpy bcopy
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24390,35 +24833,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -24427,11 +24877,11 @@
 
 for ac_func in strcmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24484,35 +24934,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -24532,10 +24989,10 @@
 
     # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
   /*)
@@ -24559,19 +25016,19 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -24586,7 +25043,7 @@
   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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24599,18 +25056,18 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+        { $as_echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+$as_echo "found msgfmt program is not GNU msgfmt; ignore it" >&6; }
         GMSGFMT=":"
       fi
       MSGFMT=$GMSGFMT
@@ -24619,10 +25076,10 @@
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
   /*)
@@ -24646,11 +25103,11 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24658,8 +25115,8 @@
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
 	else
-	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+	  { $as_echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext programs is not GNU xgettext; ignore it" >&6; }
 	  XGETTEXT=":"
 	fi
       fi
@@ -24669,10 +25126,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -24685,7 +25142,7 @@
   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_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24696,11 +25153,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24709,10 +25166,10 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -24725,7 +25182,7 @@
   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_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24736,11 +25193,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -24748,12 +25205,8 @@
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -24762,26 +25215,128 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
+if test "${ac_cv_type_off_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (off_t))
+       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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+	  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_off_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
+if test "x$ac_cv_type_off_t" = x""yes; then
+  :
+else
+
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -24792,44 +25347,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_off_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24837,14 +25366,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -24855,30 +25381,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -24890,10 +25425,10 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
 if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24917,31 +25452,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_working_alloca_h=no
 fi
 
+rm -rf conftest.dSYM
 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
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -24950,10 +25489,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
 if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24997,31 +25536,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_alloca_works=no
 fi
 
+rm -rf conftest.dSYM
 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
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
@@ -25042,10 +25585,10 @@
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25069,15 +25612,15 @@
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25130,33 +25673,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -25168,10 +25718,10 @@
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
 if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
@@ -25209,36 +25759,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -25251,20 +25804,21 @@
 
 for ac_header in stdlib.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25280,32 +25834,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25319,69 +25874,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25391,11 +25950,11 @@
 
 for ac_func in getpagesize
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25448,44 +26007,51 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_mmap_fixed_mapped=no
@@ -25629,36 +26195,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -25676,20 +26245,21 @@
 
 for ac_header in limits.h locale.h nl_types.h string.h values.h alloca.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25705,32 +26275,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25744,69 +26315,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25825,11 +26400,11 @@
 for ac_func in getcwd munmap putenv setlocale strchr strcasecmp \
 __argz_count __argz_stringify __argz_next
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25882,45 +26457,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-   { echo "$as_me:$LINENO: checking for stpcpy" >&5
-echo $ECHO_N "checking for stpcpy... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for stpcpy" >&5
+$as_echo_n "checking for stpcpy... " >&6; }
    if test "${kde_cv_func_stpcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
    kde_safe_cxxflags=$CXXFLAGS
@@ -25961,20 +26543,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_stpcpy=no
@@ -25991,8 +26574,8 @@
 
 fi
 
-   { echo "$as_me:$LINENO: result: $kde_cv_func_stpcpy" >&5
-echo "${ECHO_T}$kde_cv_func_stpcpy" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $kde_cv_func_stpcpy" >&5
+$as_echo "$kde_cv_func_stpcpy" >&6; }
    if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -26002,10 +26585,10 @@
    fi
 
    if test $ac_cv_header_locale_h = yes; then
-    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26028,31 +26611,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_val_LC_MESSAGES=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	am_cv_val_LC_MESSAGES=no
 fi
 
+rm -rf conftest.dSYM
 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
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
     if test $am_cv_val_LC_MESSAGES = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -26066,8 +26653,8 @@
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -26075,8 +26662,8 @@
          esac
        done
        LINGUAS=$NEW_LINGUAS
-       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6; }
+       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
      fi
 
           if test -n "$LINGUAS"; then
@@ -26100,10 +26687,10 @@
     ac_save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
 
-    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+$as_echo_n "checking if C++ programs can be compiled... " >&6; }
     if test "${kde_cv_stl_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
@@ -26134,20 +26721,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_stl_works=no
@@ -26158,8 +26746,8 @@
 fi
 
 
-   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+$as_echo "$kde_cv_stl_works" >&6; }
 
    if test "$kde_cv_stl_works" = "yes"; then
      # back compatible
@@ -26169,10 +26757,10 @@
 _ACEOF
 
    else
-	 { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
+	 { { $as_echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
 Check config.log for details - if you're using a Linux distribution you might miss
 a package named similar to libstdc++-dev." >&5
-echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
+$as_echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
 Check config.log for details - if you're using a Linux distribution you might miss
 a package named similar to libstdc++-dev." >&2;}
    { (exit 1); exit 1; }; }
@@ -26193,11 +26781,11 @@
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26223,20 +26811,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -26244,12 +26833,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -26258,10 +26850,10 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
 if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -26299,26 +26891,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_opendir=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
@@ -26333,8 +26929,8 @@
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -26342,10 +26938,10 @@
 fi
 
 else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
 if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -26383,26 +26979,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_opendir=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
@@ -26417,8 +27017,8 @@
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -26427,10 +27027,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26457,20 +27057,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -26562,37 +27163,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -26614,22 +27218,24 @@
 
 
 
-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`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26645,32 +27251,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26684,69 +27291,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -26782,17 +27393,17 @@
 
 
    if test "${ac_cv_header_sys_acl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/acl.h" >&5
-echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for sys/acl.h" >&5
+$as_echo_n "checking for sys/acl.h... " >&6; }
 if test "${ac_cv_header_sys_acl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
+$as_echo "$ac_cv_header_sys_acl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/acl.h usability" >&5
-echo $ECHO_N "checking sys/acl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/acl.h usability" >&5
+$as_echo_n "checking sys/acl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26808,32 +27419,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking sys/acl.h presence" >&5
-echo $ECHO_N "checking sys/acl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/acl.h presence" >&5
+$as_echo_n "checking sys/acl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26847,66 +27459,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/acl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/acl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/acl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/acl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/acl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/acl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/acl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for sys/acl.h" >&5
-echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/acl.h" >&5
+$as_echo_n "checking for sys/acl.h... " >&6; }
 if test "${ac_cv_header_sys_acl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_sys_acl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
+$as_echo "$ac_cv_header_sys_acl_h" >&6; }
 
 fi
-if test $ac_cv_header_sys_acl_h = yes; then
+if test "x$ac_cv_header_sys_acl_h" = x""yes; then
   :
 else
   USE_POSIX_ACL="no"
@@ -26936,17 +27549,17 @@
 
 
    if test "${ac_cv_header_sys_xattr_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
-echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
+$as_echo_n "checking for sys/xattr.h... " >&6; }
 if test "${ac_cv_header_sys_xattr_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
+$as_echo "$ac_cv_header_sys_xattr_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5
-echo $ECHO_N "checking sys/xattr.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5
+$as_echo_n "checking sys/xattr.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26962,32 +27575,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5
-echo $ECHO_N "checking sys/xattr.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5
+$as_echo_n "checking sys/xattr.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27001,66 +27615,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/xattr.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/xattr.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/xattr.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/xattr.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/xattr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
-echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
+$as_echo_n "checking for sys/xattr.h... " >&6; }
 if test "${ac_cv_header_sys_xattr_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_sys_xattr_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
+$as_echo "$ac_cv_header_sys_xattr_h" >&6; }
 
 fi
-if test $ac_cv_header_sys_xattr_h = yes; then
+if test "x$ac_cv_header_sys_xattr_h" = x""yes; then
   HAVE_SYS_XATTR_H="yes"
 fi
 
@@ -27092,10 +27707,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for acl_init in -lc" >&5
-echo $ECHO_N "checking for acl_init in -lc... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for acl_init in -lc" >&5
+$as_echo_n "checking for acl_init in -lc... " >&6; }
 if test "${ac_cv_lib_c_acl_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
@@ -27127,33 +27742,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_acl_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_acl_init=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_acl_init" >&5
-echo "${ECHO_T}$ac_cv_lib_c_acl_init" >&6; }
-if test $ac_cv_lib_c_acl_init = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_acl_init" >&5
+$as_echo "$ac_cv_lib_c_acl_init" >&6; }
+if test "x$ac_cv_lib_c_acl_init" = x""yes; then
   ACL_LIBS="-lc"
 else
   USE_POSIX_ACL="no"
@@ -27178,17 +27797,17 @@
 
 
    if test "${ac_cv_header_attr_libattr_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
-echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
+$as_echo_n "checking for attr/libattr.h... " >&6; }
 if test "${ac_cv_header_attr_libattr_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
-echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
+$as_echo "$ac_cv_header_attr_libattr_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking attr/libattr.h usability" >&5
-echo $ECHO_N "checking attr/libattr.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking attr/libattr.h usability" >&5
+$as_echo_n "checking attr/libattr.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27204,32 +27823,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking attr/libattr.h presence" >&5
-echo $ECHO_N "checking attr/libattr.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking attr/libattr.h presence" >&5
+$as_echo_n "checking attr/libattr.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27243,66 +27863,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: attr/libattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: attr/libattr.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: attr/libattr.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: attr/libattr.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: attr/libattr.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: attr/libattr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
-echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
+$as_echo_n "checking for attr/libattr.h... " >&6; }
 if test "${ac_cv_header_attr_libattr_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_attr_libattr_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
-echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
+$as_echo "$ac_cv_header_attr_libattr_h" >&6; }
 
 fi
-if test $ac_cv_header_attr_libattr_h = yes; then
+if test "x$ac_cv_header_attr_libattr_h" = x""yes; then
   :
 else
   USE_POSIX_ACL="no"
@@ -27326,10 +27947,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for acl_init in -lacl" >&5
-echo $ECHO_N "checking for acl_init in -lacl... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for acl_init in -lacl" >&5
+$as_echo_n "checking for acl_init in -lacl... " >&6; }
 if test "${ac_cv_lib_acl_acl_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lacl  $LIBS"
@@ -27361,33 +27982,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_acl_acl_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_acl_acl_init=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_init" >&5
-echo "${ECHO_T}$ac_cv_lib_acl_acl_init" >&6; }
-if test $ac_cv_lib_acl_acl_init = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_init" >&5
+$as_echo "$ac_cv_lib_acl_acl_init" >&6; }
+if test "x$ac_cv_lib_acl_acl_init" = x""yes; then
   ACL_LIBS="-lacl -lattr"
 else
   USE_POSIX_ACL="no"
@@ -27410,17 +28035,17 @@
 
 
    if test "${ac_cv_header_acl_libacl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
-echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
+$as_echo_n "checking for acl/libacl.h... " >&6; }
 if test "${ac_cv_header_acl_libacl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
-echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
+$as_echo "$ac_cv_header_acl_libacl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking acl/libacl.h usability" >&5
-echo $ECHO_N "checking acl/libacl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking acl/libacl.h usability" >&5
+$as_echo_n "checking acl/libacl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27436,32 +28061,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking acl/libacl.h presence" >&5
-echo $ECHO_N "checking acl/libacl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking acl/libacl.h presence" >&5
+$as_echo_n "checking acl/libacl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27475,66 +28101,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: acl/libacl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: acl/libacl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: acl/libacl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: acl/libacl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: acl/libacl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: acl/libacl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
-echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
+$as_echo_n "checking for acl/libacl.h... " >&6; }
 if test "${ac_cv_header_acl_libacl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_acl_libacl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
-echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
+$as_echo "$ac_cv_header_acl_libacl_h" >&6; }
 
 fi
-if test $ac_cv_header_acl_libacl_h = yes; then
+if test "x$ac_cv_header_acl_libacl_h" = x""yes; then
   HAVE_NON_POSIX_ACL_EXTENSIONS="yes"
 fi
 
@@ -27569,8 +28196,8 @@
   fi
 
   if test "x$with_acl" != xcheck && test "$USE_POSIX_ACL" != "yes"; then
-    { { echo "$as_me:$LINENO: error: --with-acl was given, but test for POSIX ACLs failed" >&5
-echo "$as_me: error: --with-acl was given, but test for POSIX ACLs failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --with-acl was given, but test for POSIX ACLs failed" >&5
+$as_echo "$as_me: error: --with-acl was given, but test for POSIX ACLs failed" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -27586,10 +28213,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for strlcat" >&5
-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for strlcat" >&5
+$as_echo_n "checking for strlcat... " >&6; }
 if test "${kde_cv_func_strlcat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -27605,9 +28232,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
@@ -27638,20 +28262,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_strlcat=no
@@ -27670,13 +28295,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+$as_echo "$kde_cv_func_strlcat" >&6; }
 
-{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+$as_echo_n "checking if strlcat needs custom prototype... " >&6; }
 if test "${kde_cv_proto_strlcat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_strlcat" = xyes; then
@@ -27738,28 +28363,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_strlcat=yes
   kde_cv_proto_strlcat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_strlcat="strlcat unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -27773,8 +28402,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+$as_echo "$kde_cv_proto_strlcat" >&6; }
 
 if test "x$kde_cv_func_strlcat" = xyes; then
 
@@ -27798,10 +28427,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for strlcpy" >&5
-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for strlcpy" >&5
+$as_echo_n "checking for strlcpy... " >&6; }
 if test "${kde_cv_func_strlcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -27817,9 +28446,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
@@ -27849,20 +28475,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_strlcpy=no
@@ -27881,13 +28508,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+$as_echo "$kde_cv_func_strlcpy" >&6; }
 
-{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+$as_echo_n "checking if strlcpy needs custom prototype... " >&6; }
 if test "${kde_cv_proto_strlcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_strlcpy" = xyes; then
@@ -27948,28 +28575,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_strlcpy=yes
   kde_cv_proto_strlcpy=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_strlcpy="strlcpy unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -27983,8 +28614,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+$as_echo "$kde_cv_proto_strlcpy" >&6; }
 
 if test "x$kde_cv_func_strlcpy" = xyes; then
 
@@ -28007,10 +28638,10 @@
 
 
 
-      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for main in -lutil" >&5
+$as_echo_n "checking for main in -lutil... " >&6; }
 if test "${ac_cv_lib_util_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
@@ -28036,40 +28667,44 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_util_main=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_util_main=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
-if test $ac_cv_lib_util_main = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+$as_echo "$ac_cv_lib_util_main" >&6; }
+if test "x$ac_cv_lib_util_main" = x""yes; then
   LIBUTIL="-lutil"
 fi
 
-   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+$as_echo_n "checking for main in -lcompat... " >&6; }
 if test "${ac_cv_lib_compat_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompat  $LIBS"
@@ -28095,41 +28730,45 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_compat_main=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_compat_main=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
-if test $ac_cv_lib_compat_main = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+$as_echo "$ac_cv_lib_compat_main" >&6; }
+if test "x$ac_cv_lib_compat_main" = x""yes; then
   LIBCOMPAT="-lcompat"
 fi
 
    kde_have_crypt=
-   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
@@ -28161,39 +28800,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_crypt_crypt=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_crypt_crypt=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-if test $ac_cv_lib_crypt_crypt = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
 else
-  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+$as_echo_n "checking for crypt in -lc... " >&6; }
 if test "${ac_cv_lib_c_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
@@ -28225,40 +28868,44 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_crypt=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_crypt=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
-if test $ac_cv_lib_c_crypt = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+$as_echo "$ac_cv_lib_c_crypt" >&6; }
+if test "x$ac_cv_lib_c_crypt" = x""yes; then
   kde_have_crypt=yes
 else
 
-        { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
+        { $as_echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
 You should install libcrypt from another source or configure with PAM
 support" >&5
-echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
+$as_echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
 You should install libcrypt from another source or configure with PAM
 support" >&2;}
 	kde_have_crypt=no
@@ -28276,10 +28923,10 @@
 
    fi
 
-   { echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+$as_echo_n "checking for socklen_t... " >&6; }
    if test "${kde_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       ac_ext=cpp
@@ -28316,13 +28963,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -28332,7 +28980,7 @@
          kde_cv_socklen_t_equiv=socklen_t
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -28348,13 +28996,13 @@
 
 fi
 
-   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+$as_echo "$kde_cv_socklen_t" >&6; }
    if test $kde_cv_socklen_t = no; then
-      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+$as_echo_n "checking for socklen_t equivalent for socket functions... " >&6; }
       if test "${kde_cv_socklen_t_equiv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
          kde_cv_socklen_t_equiv=int
@@ -28392,13 +29040,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -28408,7 +29057,7 @@
                break
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -28425,8 +29074,8 @@
 
 fi
 
-      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+$as_echo "$kde_cv_socklen_t_equiv" >&6; }
    fi
 
 cat >>confdefs.h <<_ACEOF
@@ -28439,10 +29088,10 @@
 _ACEOF
 
 
-   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
@@ -28474,41 +29123,45 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
@@ -28540,41 +29193,45 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
    fi
-   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+$as_echo_n "checking for inet_ntoa... " >&6; }
 if test "${ac_cv_func_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28627,37 +29284,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_inet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+$as_echo "$ac_cv_func_inet_ntoa" >&6; }
 
    if test $ac_cv_func_inet_ntoa = no; then
-     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+$as_echo_n "checking for inet_ntoa in -lnsl... " >&6; }
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
@@ -28689,41 +29350,45 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_nsl_inet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
-if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+$as_echo "$ac_cv_lib_nsl_inet_ntoa" >&6; }
+if test "x$ac_cv_lib_nsl_inet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
    fi
-   { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28776,37 +29441,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
 
    if test $ac_cv_func_connect = no; then
-      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@ -28838,42 +29507,46 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-if test $ac_cv_lib_socket_connect = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
    fi
 
-   { echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
 if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28926,37 +29599,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
 
    if test $ac_cv_func_remove = no; then
-      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
 if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
@@ -28988,43 +29665,47 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_posix_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_posix_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-if test $ac_cv_lib_posix_remove = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
    fi
 
    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   { echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
 if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -29077,38 +29758,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-if test $ac_cv_func_shmat = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
+if test "x$ac_cv_func_shmat" = x""yes; then
   :
 else
-  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
@@ -29140,33 +29825,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ipc_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ipc_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-if test $ac_cv_lib_ipc_shmat = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -29178,20 +29867,21 @@
 
 for ac_header in sys/types.h stdint.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29207,32 +29897,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29246,69 +29937,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29320,20 +30015,21 @@
 
 for ac_header in sys/bitypes.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29349,32 +30045,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29388,69 +30085,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29459,10 +30160,10 @@
 
 
    # darwin requires a poll emulation library
-   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+$as_echo_n "checking for poll in -lpoll... " >&6; }
 if test "${ac_cv_lib_poll_poll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpoll  $LIBS"
@@ -29494,33 +30195,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_poll_poll=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_poll_poll=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
-if test $ac_cv_lib_poll_poll = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+$as_echo "$ac_cv_lib_poll_poll" >&6; }
+if test "x$ac_cv_lib_poll_poll" = x""yes; then
   LIB_POLL="-lpoll"
 fi
 
@@ -29529,20 +30234,21 @@
 
 for ac_header in Carbon/Carbon.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29558,32 +30264,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29597,69 +30304,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29669,17 +30380,17 @@
 
    # CoreAudio framework
    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29695,32 +30406,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29734,66 +30446,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 
 fi
-if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = x""yes; then
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -29807,8 +30520,8 @@
 
 
 
-  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+$as_echo_n "checking if res_init needs -lresolv... " >&6; }
   kde_libs_safe="$LIBS"
   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
   cat >conftest.$ac_ext <<_ACEOF
@@ -29839,22 +30552,25 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
       LIBRESOLV="-lresolv"
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_RES_INIT 1
@@ -29862,24 +30578,25 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$kde_libs_safe
 
 
 
-{ echo "$as_me:$LINENO: checking for res_init" >&5
-echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for res_init" >&5
+$as_echo_n "checking for res_init... " >&6; }
 if test "${kde_cv_func_res_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -29895,9 +30612,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
@@ -29928,20 +30642,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_res_init=no
@@ -29960,13 +30675,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+$as_echo "$kde_cv_func_res_init" >&6; }
 
-{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+$as_echo_n "checking if res_init needs custom prototype... " >&6; }
 if test "${kde_cv_proto_res_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_res_init" = xyes; then
@@ -30028,28 +30743,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_res_init=yes
   kde_cv_proto_res_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_res_init="res_init unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -30063,8 +30782,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+$as_echo "$kde_cv_proto_res_init" >&6; }
 
 if test "x$kde_cv_func_res_init" = xyes; then
 
@@ -30091,10 +30810,10 @@
    LIBSOCKET="$X_EXTRA_LIBS"
 
 
-   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+$as_echo_n "checking for killpg in -lucb... " >&6; }
 if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
@@ -30126,47 +30845,51 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ucb_killpg=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ucb_killpg=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
-if test $ac_cv_lib_ucb_killpg = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+$as_echo "$ac_cv_lib_ucb_killpg" >&6; }
+if test "x$ac_cv_lib_ucb_killpg" = x""yes; then
   LIBUCB="-lucb"
 fi
 
 
    case $host in     *-*-lynxos* )
-        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+$as_echo_n "checking LynxOS header file wrappers... " >&6; }
         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-        { echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6; }
-        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: result: disabled" >&5
+$as_echo "disabled" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
@@ -30198,100 +30921,50 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_bsd_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
   LIBSOCKET="-lbsd"
 fi
           ;;
     esac
 
-     { echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -30302,11 +30975,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -30319,13 +30991,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -30339,11 +31012,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30356,20 +31028,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -30383,7 +31056,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -30393,11 +31066,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
 test_array [0] = 0
 
   ;
@@ -30410,13 +31082,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -30430,11 +31103,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30447,20 +31119,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -30474,7 +31147,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -30494,11 +31167,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30511,20 +31183,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -30535,11 +31208,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_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 ;;
@@ -30552,9 +31227,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -30564,20 +31238,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (int))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -30590,43 +31266,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
@@ -30634,68 +31315,14 @@
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
-   { echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+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.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -30706,11 +31333,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -30723,13 +31349,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -30743,11 +31370,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30760,20 +31386,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -30787,7 +31414,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -30797,11 +31424,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
 test_array [0] = 0
 
   ;
@@ -30814,13 +31440,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -30834,11 +31461,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30851,20 +31477,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -30878,7 +31505,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -30898,11 +31525,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30915,20 +31541,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -30939,11 +31566,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_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 ;;
@@ -30956,9 +31585,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (short)); }
+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -30968,20 +31596,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (short))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -30994,43 +31624,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
@@ -31038,68 +31673,14 @@
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 _ACEOF
 
-  { echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+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.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -31110,11 +31691,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -31127,13 +31707,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -31147,11 +31728,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31164,20 +31744,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -31191,7 +31772,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -31201,11 +31782,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -31218,13 +31798,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -31238,11 +31819,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31255,20 +31835,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -31282,7 +31863,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -31302,11 +31883,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31319,20 +31899,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -31343,11 +31924,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_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 ;;
@@ -31360,9 +31943,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -31372,20 +31954,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -31398,43 +31982,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -31442,68 +32031,14 @@
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
-  { echo "$as_me:$LINENO: checking for char *" >&5
-echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
-if test "${ac_cv_type_char_p+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.  */
-$ac_includes_default
-typedef char * ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_char_p=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of char *" >&5
+$as_echo_n "checking size of char *... " >&6; }
 if test "${ac_cv_sizeof_char_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -31514,11 +32049,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -31531,13 +32065,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -31551,11 +32086,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31568,20 +32102,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -31595,7 +32130,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -31605,11 +32140,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char *))) < 0)];
 test_array [0] = 0
 
   ;
@@ -31622,13 +32156,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -31642,11 +32177,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31659,20 +32193,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -31686,7 +32221,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -31706,11 +32241,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -31723,20 +32257,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -31747,11 +32282,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_char_p=$ac_lo;;
 '') if test "$ac_cv_type_char_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *)
+$as_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 ;;
@@ -31764,9 +32301,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (char *)); }
+static unsigned long int ulongval () { return (long int) (sizeof (char *)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -31776,20 +32312,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (char *))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char *))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char *))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -31802,43 +32340,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char_p=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_char_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+$as_echo "$ac_cv_sizeof_char_p" >&6; }
 
 
 
@@ -31848,10 +32391,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -31883,33 +32426,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
 
 LIBDL="-ldl"
 ac_cv_have_dlfcn=yes
@@ -31917,10 +32464,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+$as_echo_n "checking for shl_unload in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -31952,33 +32499,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_unload=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_unload=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
-if test $ac_cv_lib_dld_shl_unload = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+$as_echo "$ac_cv_lib_dld_shl_unload" >&6; }
+if test "x$ac_cv_lib_dld_shl_unload" = x""yes; then
 
 LIBDL="-ldld"
 ac_cv_have_shload=yes
@@ -31991,68 +32542,14 @@
 
 
 
-  { echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
 if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -32063,11 +32560,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -32080,13 +32576,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -32100,11 +32597,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32117,20 +32613,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -32144,7 +32641,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -32154,11 +32651,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
 test_array [0] = 0
 
   ;
@@ -32171,13 +32667,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -32191,11 +32688,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32208,20 +32704,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -32235,7 +32732,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -32255,11 +32752,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32272,20 +32768,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -32296,11 +32793,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_size_t=$ac_lo;;
 '') if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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)
+$as_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 ;;
@@ -32313,9 +32812,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (size_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -32325,20 +32823,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (size_t))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (size_t))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (size_t))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -32351,43 +32851,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 
 
@@ -32396,68 +32901,14 @@
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef unsigned long ac__type_new_;
-int
-main ()
-{
-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); } && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_unsigned_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5
+$as_echo_n "checking size of unsigned long... " >&6; }
 if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -32468,11 +32919,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -32485,13 +32935,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -32505,11 +32956,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32522,20 +32972,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -32549,7 +33000,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -32559,11 +33010,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -32576,13 +33026,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -32596,11 +33047,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32613,20 +33063,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -32640,7 +33091,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -32660,11 +33111,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -32677,20 +33127,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -32701,11 +33152,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
 '') if test "$ac_cv_type_unsigned_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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)
+$as_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 ;;
@@ -32718,9 +33171,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   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_)); }
+static long int longval () { return (long int) (sizeof (unsigned long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -32730,20 +33182,22 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (unsigned long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (unsigned long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (unsigned long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -32756,43 +33210,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_unsigned_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_unsigned_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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)
+$as_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
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
 
 
 
@@ -32802,8 +33261,8 @@
 
 
 
-  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+$as_echo_n "checking sizeof size_t == sizeof unsigned long... " >&6; }
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32829,31 +33288,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-      { { echo "$as_me:$LINENO: error:
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+      { { $as_echo "$as_me:$LINENO: error:
        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
        does not apply. Please mail kde-devel@kde.org with a description of your system!
       " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
        does not apply. Please mail kde-devel@kde.org with a description of your system!
       " >&2;}
@@ -32864,10 +33324,10 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { echo "$as_me:$LINENO: checking for PIE support" >&5
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for PIE support" >&5
+$as_echo_n "checking for PIE support... " >&6; }
 if test "${kde_cv_val_pie_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -32906,26 +33366,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_cv_val_pie_support=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_pie_support=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -32939,11 +33403,11 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+$as_echo "$kde_cv_val_pie_support" >&6; }
 
-  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+$as_echo_n "checking if enabling -pie/fPIE support... " >&6; }
 
   # Check whether --enable-pie was given.
 if test "${enable_pie+set}" = set; then
@@ -32957,8 +33421,8 @@
     kde_has_pie_support=$kde_cv_val_pie_support
   fi
 
-  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-echo "${ECHO_T}$kde_has_pie_support" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+$as_echo "$kde_has_pie_support" >&6; }
 
   KDE_USE_FPIE=""
   KDE_USE_PIE=""
@@ -32976,20 +33440,21 @@
 
 for ac_header in crt_externs.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33005,32 +33470,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33044,79 +33510,83 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+$as_echo_n "checking for _NSGetEnviron... " >&6; }
 if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -33169,32 +33639,36 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func__NSGetEnviron=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func__NSGetEnviron=no
 fi
 
+rm -rf conftest.dSYM
 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
-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
-if test $ac_cv_func__NSGetEnviron = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+$as_echo "$ac_cv_func__NSGetEnviron" >&6; }
+if test "x$ac_cv_func__NSGetEnviron" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_NSGETENVIRON 1
@@ -33213,11 +33687,11 @@
 
 for ac_func in vsnprintf snprintf
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -33270,35 +33744,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -33351,11 +33832,11 @@
 
 if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
 
-{ echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 if test "${kde_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
@@ -33394,13 +33875,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -33408,7 +33890,7 @@
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Look for the header file in a standard set of common directories.
@@ -33490,23 +33972,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS="$ac_save_LIBS"
@@ -33558,6 +34043,7 @@
 done
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = NO
@@ -33585,7 +34071,7 @@
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib la dll; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -33599,7 +34085,7 @@
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -33628,14 +34114,14 @@
 fi
 
 if test "$kde_x_includes" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
+$as_echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$kde_x_libraries" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+$as_echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -33648,12 +34134,12 @@
 eval "$kde_cv_have_x"
 
 if test "$have_x" != yes; then
-  { echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
-  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+$as_echo "libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
 fi
 
 if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
@@ -33681,10 +34167,10 @@
 # These have to be linked with before -lX11, unlike the other
 # libraries we check for below, so use a different variable.
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
@@ -33716,33 +34202,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
   LIBSM="-lSM -lICE"
 fi
 
@@ -33750,10 +34240,10 @@
 
 LIB_X11='-lX11 $(LIBSOCKET)'
 
-{ echo "$as_me:$LINENO: checking for libXext" >&5
-echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libXext" >&5
+$as_echo_n "checking for libXext... " >&6; }
 if test "${kde_cv_have_libXext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_ldflags_safe="$LDFLAGS"
@@ -33790,27 +34280,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_cv_have_libXext=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_have_libXext=no
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -33820,14 +34314,14 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+$as_echo "$kde_cv_have_libXext" >&6; }
 
 if test "$kde_cv_have_libXext" = "no"; then
-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+  { { $as_echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
 can't find it itself, we stop here assuming that make wouldn't find
 them either." >&5
-echo "$as_me: error: We need a working libXext to proceed. Since configure
+$as_echo "$as_me: error: We need a working libXext to proceed. Since configure
 can't find it itself, we stop here assuming that make wouldn't find
 them either." >&2;}
    { (exit 1); exit 1; }; }
@@ -33953,10 +34447,10 @@
   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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -33971,7 +34465,7 @@
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -33984,11 +34478,11 @@
 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; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -34015,8 +34509,8 @@
     else
       PTHREAD_LIBS_save="$PTHREAD_LIBS"
       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+$as_echo_n "checking for pthread_create in $PTHREAD_LIBS... " >&6; }
 
      kde_save_LDFLAGS="$LDFLAGS"
           kde_save_LIBS="$LIBS"
@@ -34026,11 +34520,11 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
+     as_ac_Lib=`$as_echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+$as_echo_n "checking for pthread_create in -l$PTHREAD_LIBS... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PTHREAD_LIBS  $LIBS"
@@ -34062,34 +34556,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
+rm -rf conftest.dSYM
 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
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   LIBPTHREAD="$PTHREAD_LIBS_save"
 fi
 
@@ -34101,10 +34602,10 @@
   fi
 
     if test -z "$LIBPTHREAD"; then
-    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -34136,41 +34637,45 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   LIBPTHREAD="-lpthread"
 fi
 
   fi
 
     if test -z "$LIBPTHREAD" ; then
-    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
     kde_safe_libs=$LIBS
     LIBS="$LIBS -lpthread"
     cat >conftest.$ac_ext <<_ACEOF
@@ -34194,31 +34699,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         LIBPTHREAD="-lpthread"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS=$kde_safe_libs
@@ -34234,11 +34743,11 @@
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+$as_echo_n "checking whether $CXX supports -pthread... " >&6; }
 kde_cache=`echo pthread | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -34274,26 +34783,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -34307,13 +34820,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  USE_THREADS="-D_THREAD_SAFE -pthread"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -34325,11 +34838,11 @@
     case $host_os in
  	solaris*)
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+$as_echo_n "checking whether $CXX supports -mt... " >&6; }
 kde_cache=`echo mt | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -34365,26 +34878,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -34398,13 +34915,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  USE_THREADS="-mt"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -34431,8 +34948,8 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for extra includes" >&5
-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for extra includes" >&5
+$as_echo_n "checking for extra includes... " >&6; }
 
 # Check whether --with-extra-includes was given.
 if test "${with_extra_includes+set}" = set; then
@@ -34459,12 +34976,12 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+$as_echo "$kde_use_extra_includes" >&6; }
 
 kde_extra_libs=
-{ echo "$as_me:$LINENO: checking for extra libs" >&5
-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for extra libs" >&5
+$as_echo_n "checking for extra libs... " >&6; }
 
 # Check whether --with-extra-libs was given.
 if test "${with_extra_libs+set}" = set; then
@@ -34492,16 +35009,16 @@
 
 
 
-{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+$as_echo "$kde_use_extra_libs" >&6; }
 
 
 
 
-{ echo "$as_me:$LINENO: checking for libz" >&5
-echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libz" >&5
+$as_echo_n "checking for libz... " >&6; }
 if test "${ac_cv_lib_z+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -34539,26 +35056,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_z='-lz'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_z=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -34572,15 +35093,15 @@
 _ACEOF
 
   LIBZ="$ac_cv_lib_z"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+$as_echo "$ac_cv_lib_z" >&6; }
 else
-  { { echo "$as_me:$LINENO: error: not found.
+  { { $as_echo "$as_me:$LINENO: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
           Check your installation and look into config.log" >&5
-echo "$as_me: error: not found.
+$as_echo "$as_me: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
@@ -34593,10 +35114,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for libpng" >&5
-echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libpng" >&5
+$as_echo_n "checking for libpng... " >&6; }
 if test "${ac_cv_lib_png+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -34635,27 +35156,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_png=no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -34670,21 +35195,21 @@
 
   LIBPNG="$ac_cv_lib_png"
 
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+$as_echo "$ac_cv_lib_png" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   LIBPNG=""
 
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+$as_echo_n "checking for libjpeg6b... " >&6; }
 if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -34720,26 +35245,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_6b=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -34750,16 +35279,16 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_6b"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+$as_echo "$ac_cv_lib_jpeg_6b" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
-{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -34795,26 +35324,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_normal=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -34825,11 +35358,11 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_normal"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+$as_echo "$ac_cv_lib_jpeg_normal" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
        LIBJPEG=
 
@@ -34849,7 +35382,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 34852: $i/$j" >&5
+    echo "configure: 35385: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -34868,14 +35401,14 @@
 
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    { echo "$as_me:$LINENO: WARNING:
+    { $as_echo "$as_me:$LINENO: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
 libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
 Disabling JPEG support.
 " >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
@@ -34883,8 +35416,8 @@
 Disabling JPEG support.
 " >&2;}
   else
-    { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
+$as_echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
   fi
   jpeg_incdir=
   LIBJPEG=
@@ -34896,15 +35429,15 @@
 
 
 
-   { echo "$as_me:$LINENO: checking for perl" >&5
-echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for perl" >&5
+$as_echo_n "checking for perl... " >&6; }
    if test -n "$PERL"; then
         kde_cv_path="$PERL";
    else
         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -34946,18 +35479,18 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+		    { { $as_echo "$as_me:$LINENO: error: No Perl found in your $PATH.
 We need perl to generate some code." >&5
-echo "$as_me: error: No Perl found in your $PATH.
+$as_echo "$as_me: error: No Perl found in your $PATH.
 We need perl to generate some code." >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       PERL=$kde_cv_path
 
    fi
@@ -35082,8 +35615,8 @@
   LIBQT="$LIBQT $LIBDL"
 fi
 
-{ echo "$as_me:$LINENO: checking for Qt" >&5
-echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Qt" >&5
+$as_echo_n "checking for Qt... " >&6; }
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
 LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
@@ -35122,7 +35655,7 @@
 
 
 if test "${ac_cv_have_qt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   #try to guess Qt locations
 
@@ -35133,10 +35666,10 @@
 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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -35151,7 +35684,7 @@
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -35164,11 +35697,11 @@
 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; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -35195,7 +35728,7 @@
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 35198: $i/$j" >&5
+    echo "configure: 35731: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -35213,10 +35746,10 @@
 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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -35231,7 +35764,7 @@
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -35244,11 +35777,11 @@
 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; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -35363,7 +35896,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
   rm -f conftest*
 else
@@ -35402,9 +35935,9 @@
     fi
   fi
 
-  { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
+  { { $as_echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
 For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
-echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
+$as_echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
 For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -35417,13 +35950,13 @@
 eval "$ac_cv_have_qt"
 
 if test "$have_qt" != yes; then
-  { echo "$as_me:$LINENO: result: $have_qt" >&5
-echo "${ECHO_T}$have_qt" >&6; };
+  { $as_echo "$as_me:$LINENO: result: $have_qt" >&5
+$as_echo "$have_qt" >&6; };
 else
   ac_cv_have_qt="have_qt=yes \
     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+$as_echo "libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
 
   qt_libraries="$ac_qt_libraries"
   qt_includes="$ac_qt_includes"
@@ -35432,10 +35965,10 @@
 if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
 
 
-{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+$as_echo_n "checking if Qt compiles without flags... " >&6; }
 if test "${kde_cv_qt_direct+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -35531,7 +36064,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
   kde_cv_qt_direct="yes"
 else
@@ -35560,12 +36093,12 @@
 
 
 if test "$kde_cv_qt_direct" = "yes"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   qt_libraries=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
@@ -35603,15 +36136,15 @@
    fi
 
 
-   { echo "$as_me:$LINENO: checking for moc" >&5
-echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for moc" >&5
+$as_echo_n "checking for moc... " >&6; }
    if test -n "$MOC"; then
         kde_cv_path="$MOC";
    else
         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -35653,10 +36186,10 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+    { { $as_echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
 You need to have a running moc binary.
 configure tried to run $ac_cv_path_moc and the test didn't
@@ -35664,7 +36197,7 @@
 the environment variable MOC to the right one before running
 configure.
 " >&5
-echo "$as_me: error: No Qt meta object compiler (moc) found!
+$as_echo "$as_me: error: No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
 You need to have a running moc binary.
 configure tried to run $ac_cv_path_moc and the test didn't
@@ -35675,23 +36208,23 @@
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       MOC=$kde_cv_path
 
    fi
 
    if test -z "$UIC_NOT_NEEDED"; then
 
-   { echo "$as_me:$LINENO: checking for uic" >&5
-echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for uic" >&5
+$as_echo_n "checking for uic... " >&6; }
    if test -n "$UIC_PATH"; then
         kde_cv_path="$UIC_PATH";
    else
         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -35733,19 +36266,19 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
       UIC_PATH=""
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       UIC_PATH=$kde_cv_path
 
    fi
 
      if test -z "$UIC_PATH" ; then
 
-    { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
+    { $as_echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
 You need to have a running uic binary.
 configure tried to run $ac_cv_path_uic and the test didn't
@@ -35753,7 +36286,7 @@
 the environment variable UIC to the right one before running
 configure.
 " >&5
-echo "$as_me: WARNING: No Qt ui compiler (uic) found!
+$as_echo "$as_me: WARNING: No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
 You need to have a running uic binary.
 configure tried to run $ac_cv_path_uic and the test didn't
@@ -35768,11 +36301,11 @@
 
        if test $kde_qtver = 3; then
 
-    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+$as_echo_n "checking whether uic supports -L ... " >&6; }
     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
     if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         cat >conftest.ui <<EOT
@@ -35782,7 +36315,7 @@
         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
   (eval $ac_uic_testrun) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
             eval "kde_cv_prog_uic_$kde_cache=yes"
         else
@@ -35794,23 +36327,23 @@
 
 
     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         :
         ac_uic_supports_libpath=yes
     else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         :
         ac_uic_supports_libpath=no
     fi
 
 
-    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+$as_echo_n "checking whether uic supports -nounload ... " >&6; }
     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
     if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         cat >conftest.ui <<EOT
@@ -35820,7 +36353,7 @@
         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
   (eval $ac_uic_testrun) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
             eval "kde_cv_prog_uic_$kde_cache=yes"
         else
@@ -35832,13 +36365,13 @@
 
 
     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         :
         ac_uic_supports_nounload=yes
     else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         :
         ac_uic_supports_nounload=no
     fi
@@ -35869,10 +36402,10 @@
 
 
 if test -n "$LIBJPEG"; then
-{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+$as_echo_n "checking if Qt needs $LIBJPEG... " >&6; }
 if test "${kde_cv_qt_jpeg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -35914,26 +36447,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_qt_jpeg=no"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "kde_cv_qt_jpeg=yes"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -35950,12 +36487,12 @@
 
 
 if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   LIBJPEG_QT='$(LIBJPEG)'
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   LIBJPEG_QT=
 fi
 
@@ -35974,6 +36511,10 @@
   fi
 done
 
+# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
+LIB_QT_EXT="$LIB_QT"
+LIB_QT="$kde_int_qt"
+
 
 
 
@@ -35985,8 +36526,9 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for rpath" >&5
-echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for rpath" >&5
+$as_echo_n "checking for rpath... " >&6; }
 # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath; USE_RPATH=$enableval
@@ -36017,11 +36559,11 @@
 
 
 
-{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-echo "${ECHO_T}$USE_RPATH" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+$as_echo "$USE_RPATH" >&6; }
 
-{ echo "$as_me:$LINENO: checking for KDE" >&5
-echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for KDE" >&5
+$as_echo_n "checking for KDE... " >&6; }
 
 if test "${prefix}" != NONE; then
   kde_includes=${includedir}
@@ -36050,7 +36592,7 @@
 fi
 
 if test "${ac_cv_have_kde+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   #try to guess kde locations
 
@@ -36073,7 +36615,7 @@
 do
   for j in $kde_check_header;
   do
-    echo "configure: 36076: $i/$j" >&5
+    echo "configure: 36618: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -36085,10 +36627,10 @@
 ac_kde_includes="$kde_incdir"
 
 if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  { { echo "$as_me:$LINENO: error:
+  { { $as_echo "$as_me:$LINENO: error:
 in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!" >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
@@ -36103,7 +36645,7 @@
 do
   for j in $kde_check_lib;
   do
-    echo "configure: 36106: $i/$j" >&5
+    echo "configure: 36648: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -36121,7 +36663,7 @@
 do
   for j in "kde3/plugins/designer/kdewidgets.la";
   do
-    echo "configure: 36124: $i/$j" >&5
+    echo "configure: 36666: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_widgetdir=$i
@@ -36132,20 +36674,20 @@
 
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-{ { echo "$as_me:$LINENO: error:
+{ { $as_echo "$as_me:$LINENO: error:
 in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!" >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-{ { echo "$as_me:$LINENO: error:
+{ { $as_echo "$as_me:$LINENO: error:
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs" >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs" >&2;}
    { (exit 1); exit 1; }; }
@@ -36180,12 +36722,12 @@
  fi
  if test "$exec_prefix" = NONE; then
   ac_kde_exec_prefix="$ac_kde_prefix"
-  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+  { $as_echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+$as_echo "will be installed in $ac_kde_prefix" >&6; }
  else
   ac_kde_exec_prefix="$exec_prefix"
-  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+  { $as_echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+$as_echo "will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
  fi
 
  kde_libraries="${libdir}"
@@ -36194,8 +36736,8 @@
 else
   ac_cv_have_kde="have_kde=yes \
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+$as_echo "libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
 
   kde_libraries="$ac_kde_libraries"
   kde_includes="$ac_kde_includes"
@@ -36233,10 +36775,10 @@
 
 if test x$ac_uic_supports_libpath = xyes; then
 
-{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+$as_echo_n "checking if UIC has KDE plugins available... " >&6; }
 if test "${kde_cv_uic_plugins+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat > actest.ui << EOF
@@ -36263,7 +36805,7 @@
 if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
   (eval $kde_line) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 	# if you're trying to debug this check and think it's incorrect,
 	# better check your installation. The check _is_ correct - your
@@ -36277,10 +36819,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+$as_echo "$kde_cv_uic_plugins" >&6; }
 if test "$kde_cv_uic_plugins" != yes; then
-	{ { echo "$as_me:$LINENO: error:
+	{ { $as_echo "$as_me:$LINENO: error:
 you need to install kdelibs first.
 
 If you did install kdelibs, then the Qt version that is picked up by
@@ -36289,7 +36831,7 @@
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 you need to install kdelibs first.
 
 If you did install kdelibs, then the Qt version that is picked up by
@@ -36312,8 +36854,8 @@
 
 
 
-  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+$as_echo_n "checking grepping for visibility push/pop in headers... " >&6; }
 
   if test "x$GXX" = "xyes"; then
 
@@ -36338,16 +36880,16 @@
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "GCC visibility push" >/dev/null 2>&1; then
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
       kde_stdc_visibility_patched=yes
 else
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-      { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+      { $as_echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
                    visibility support. Disabling -fvisibility=hidden" >&5
-echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+$as_echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
                    visibility support. Disabling -fvisibility=hidden" >&2;}
 
       kde_stdc_visibility_patched=no
@@ -36364,11 +36906,11 @@
 
     kde_have_gcc_visibility=no
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+$as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
 kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36404,26 +36946,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -36437,8 +36983,8 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
 
       kde_have_gcc_visibility=yes
@@ -36450,10 +36996,10 @@
 fi
 
 
-      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+$as_echo_n "checking if Qt is patched for -fvisibility... " >&6; }
 if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36497,20 +37043,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_qt_gcc_visibility_patched=yes
@@ -36528,16 +37075,16 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+$as_echo "$kde_cv_val_qt_gcc_visibility_patched" >&6; }
 
       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 
-    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+$as_echo_n "checking for gcc -fvisibility-inlines-hidden bug... " >&6; }
 if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36586,26 +37133,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_cv_val_gcc_visibility_bug=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_gcc_visibility_bug=yes
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -36620,8 +37171,8 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+$as_echo "$kde_cv_val_gcc_visibility_bug" >&6; }
 
     if test x$kde_cv_val_gcc_visibility_bug = xno; then
       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
@@ -36637,8 +37188,8 @@
       fi
 
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
@@ -36649,12 +37200,12 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for KDE paths" >&5
-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for KDE paths" >&5
+$as_echo_n "checking for KDE paths... " >&6; }
 kde_result=""
 kde_cached_paths=yes
 if test "${kde_cv_all_paths+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36761,12 +37312,12 @@
 else
 
   if test $kde_qtver = 1; then
-     { echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6; }
+     { $as_echo "$as_me:$LINENO: result: compiling" >&5
+$as_echo "compiling" >&6; }
 
 
-    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+$as_echo_n "checking for KDE headers installed... " >&6; }
 
      ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -36818,15 +37369,15 @@
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  else
-   { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+   { { $as_echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system is not able to compile a small KDE application!
+$as_echo "$as_me: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
@@ -36860,23 +37411,23 @@
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+$as_echo_n "checking for KDE libraries installed... " >&6; }
 ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+  { { $as_echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system fails at linking a small KDE application!
+$as_echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
@@ -36921,8 +37472,8 @@
 
 
   else
-     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
+     { { $as_echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
+$as_echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -37063,12 +37614,12 @@
 else
 
   if test $kde_qtver = 1; then
-     { echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6; }
+     { $as_echo "$as_me:$LINENO: result: compiling" >&5
+$as_echo "compiling" >&6; }
 
 
-    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+$as_echo_n "checking for KDE headers installed... " >&6; }
 
      ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -37120,15 +37671,15 @@
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  else
-   { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+   { { $as_echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system is not able to compile a small KDE application!
+$as_echo "$as_me: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
@@ -37162,23 +37713,23 @@
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+$as_echo_n "checking for KDE libraries installed... " >&6; }
 ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+  { { $as_echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system fails at linking a small KDE application!
+$as_echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
@@ -37223,8 +37774,8 @@
 
 
   else
-     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
+     { { $as_echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
+$as_echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -37249,13 +37800,13 @@
   kde_result="$kde_result (cache overridden)"
 fi
 if test "$kde_have_all_paths" = "no"; then
-  { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
+  { { $as_echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
 Since it had compiled and linked before, it must be a strange problem on your system.
 Look at config.log for details. If you are not able to fix this, look at
 http://www.kde.org/faq/installation.html or any www.kde.org mirror.
 (If you're using an egcs version on Linux, you may update binutils!)
 " >&5
-echo "$as_me: error: configure could not run a little KDE program to test the environment.
+$as_echo "$as_me: error: configure could not run a little KDE program to test the environment.
 Since it had compiled and linked before, it must be a strange problem on your system.
 Look at config.log for details. If you are not able to fix this, look at
 http://www.kde.org/faq/installation.html or any www.kde.org mirror.
@@ -37264,8 +37815,8 @@
    { (exit 1); exit 1; }; }
 else
   rm -f conftest*
-  { echo "$as_me:$LINENO: result: $kde_result" >&5
-echo "${ECHO_T}$kde_result" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $kde_result" >&5
+$as_echo "$kde_result" >&6; }
 fi
 
 bindir=$kde_bindir
@@ -37310,15 +37861,15 @@
 
         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
 
-   { echo "$as_me:$LINENO: checking for dcopidl" >&5
-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for dcopidl" >&5
+$as_echo_n "checking for dcopidl... " >&6; }
    if test -n "$DCOPIDL"; then
         kde_cv_path="$DCOPIDL";
    else
         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37360,34 +37911,34 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program dcopidl was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program dcopidl was not found!
+$as_echo "$as_me: error: The important program dcopidl was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       DCOPIDL=$kde_cv_path
 
    fi
 
 
-   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+$as_echo_n "checking for dcopidl2cpp... " >&6; }
    if test -n "$DCOPIDL2CPP"; then
         kde_cv_path="$DCOPIDL2CPP";
    else
         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37429,35 +37980,35 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program dcopidl2cpp was not found!
+$as_echo "$as_me: error: The important program dcopidl2cpp was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       DCOPIDL2CPP=$kde_cv_path
 
    fi
 
         if test "$build_arts" '!=' "no"; then
 
-   { echo "$as_me:$LINENO: checking for mcopidl" >&5
-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for mcopidl" >&5
+$as_echo_n "checking for mcopidl... " >&6; }
    if test -n "$MCOPIDL"; then
         kde_cv_path="$MCOPIDL";
    else
         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37499,36 +38050,36 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program mcopidl was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&5
-echo "$as_me: error: The important program mcopidl was not found!
+$as_echo "$as_me: error: The important program mcopidl was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       MCOPIDL=$kde_cv_path
 
    fi
 
 
-   { echo "$as_me:$LINENO: checking for artsc-config" >&5
-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for artsc-config" >&5
+$as_echo_n "checking for artsc-config... " >&6; }
    if test -n "$ARTSCCONFIG"; then
         kde_cv_path="$ARTSCCONFIG";
    else
         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37570,37 +38121,37 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program artsc-config was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&5
-echo "$as_me: error: The important program artsc-config was not found!
+$as_echo "$as_me: error: The important program artsc-config was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       ARTSCCONFIG=$kde_cv_path
 
    fi
 
         fi
 
-   { echo "$as_me:$LINENO: checking for meinproc" >&5
-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for meinproc" >&5
+$as_echo_n "checking for meinproc... " >&6; }
    if test -n "$MEINPROC"; then
         kde_cv_path="$MEINPROC";
    else
         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37642,12 +38193,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       MEINPROC=$kde_cv_path
 
    fi
@@ -37676,15 +38227,15 @@
 
         if test -n "$kde32ornewer"; then
 
-   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+$as_echo_n "checking for kconfig_compiler... " >&6; }
    if test -n "$KCONFIG_COMPILER"; then
         kde_cv_path="$KCONFIG_COMPILER";
    else
         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37726,34 +38277,34 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kconfig_compiler was not found!
+$as_echo "$as_me: error: The important program kconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       KCONFIG_COMPILER=$kde_cv_path
 
    fi
 
 
-   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for dcopidlng" >&5
+$as_echo_n "checking for dcopidlng... " >&6; }
    if test -n "$DCOPIDLNG"; then
         kde_cv_path="$DCOPIDLNG";
    else
         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37795,20 +38346,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program dcopidlng was not found!
+$as_echo "$as_me: error: The important program dcopidlng was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       DCOPIDLNG=$kde_cv_path
 
    fi
@@ -37816,15 +38367,15 @@
         fi
         if test -n "$kde33ornewer"; then
 
-   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+$as_echo_n "checking for makekdewidgets... " >&6; }
    if test -n "$MAKEKDEWIDGETS"; then
         kde_cv_path="$MAKEKDEWIDGETS";
    else
         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37866,20 +38417,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+    { { $as_echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program makekdewidgets was not found!
+$as_echo "$as_me: error: The important program makekdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       MAKEKDEWIDGETS=$kde_cv_path
 
    fi
@@ -37887,15 +38438,15 @@
 
         fi
 
-   { echo "$as_me:$LINENO: checking for xmllint" >&5
-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for xmllint" >&5
+$as_echo_n "checking for xmllint... " >&6; }
    if test -n "$XMLLINT"; then
         kde_cv_path="$XMLLINT";
    else
         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -37937,12 +38488,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
       XMLLINT=""
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       XMLLINT=$kde_cv_path
 
    fi
@@ -37957,7 +38508,7 @@
 do
   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
   do
-    echo "configure: 37960: $i/$j" >&5
+    echo "configure: 38511: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -38165,11 +38716,11 @@
 
 for ac_header in X11/extensions/shape.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38190,20 +38741,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -38211,12 +38763,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -38249,11 +38804,11 @@
 
 for ac_header in X11/extensions/XShm.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38271,20 +38826,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -38292,12 +38848,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  have_mitshm=yes
 else
@@ -38332,20 +38891,21 @@
 
 for ac_header in X11/ICE/ICElib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38361,32 +38921,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38400,69 +38961,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -38491,17 +39056,17 @@
 
 
    if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
-echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
+$as_echo_n "checking for sys/sendfile.h... " >&6; }
 if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
+$as_echo "$ac_cv_header_sys_sendfile_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/sendfile.h usability" >&5
-echo $ECHO_N "checking sys/sendfile.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/sendfile.h usability" >&5
+$as_echo_n "checking sys/sendfile.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38517,32 +39082,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking sys/sendfile.h presence" >&5
-echo $ECHO_N "checking sys/sendfile.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking sys/sendfile.h presence" >&5
+$as_echo_n "checking sys/sendfile.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38556,66 +39122,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/sendfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/sendfile.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/sendfile.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/sendfile.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/sendfile.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/sendfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
-echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
+$as_echo_n "checking for sys/sendfile.h... " >&6; }
 if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_sys_sendfile_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
+$as_echo "$ac_cv_header_sys_sendfile_h" >&6; }
 
 fi
-if test $ac_cv_header_sys_sendfile_h = yes; then
+if test "x$ac_cv_header_sys_sendfile_h" = x""yes; then
   have_sendfile=yes
 fi
 
@@ -38631,10 +39198,10 @@
 ac_cpp=$ac_cpp_safe
 CPPFLAGS=$ac_CPPFLAGS_safe
 
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
 if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38661,20 +39228,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_time=no
@@ -38682,8 +39250,8 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -38700,28 +39268,78 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -38733,33 +39351,34 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -38771,20 +39390,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -38792,29 +39412,69 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
@@ -38825,30 +39485,101 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (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
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -38867,14 +39598,14 @@
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -38886,55 +39617,62 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
 cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -38953,10 +39691,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for setenv" >&5
-echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for setenv" >&5
+$as_echo_n "checking for setenv... " >&6; }
 if test "${kde_cv_func_setenv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -38972,9 +39710,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
@@ -39002,20 +39737,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_setenv=no
@@ -39034,13 +39770,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
-echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+$as_echo "$kde_cv_func_setenv" >&6; }
 
-{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+$as_echo_n "checking if setenv needs custom prototype... " >&6; }
 if test "${kde_cv_proto_setenv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_setenv" = xyes; then
@@ -39099,28 +39835,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_setenv=yes
   kde_cv_proto_setenv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_setenv="setenv unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -39134,8 +39874,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
-echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+$as_echo "$kde_cv_proto_setenv" >&6; }
 
 if test "x$kde_cv_func_setenv" = xyes; then
 
@@ -39159,10 +39899,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for unsetenv" >&5
-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for unsetenv" >&5
+$as_echo_n "checking for unsetenv... " >&6; }
 if test "${kde_cv_func_unsetenv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -39178,9 +39918,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
@@ -39208,20 +39945,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_unsetenv=no
@@ -39240,13 +39978,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+$as_echo "$kde_cv_func_unsetenv" >&6; }
 
-{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+$as_echo_n "checking if unsetenv needs custom prototype... " >&6; }
 if test "${kde_cv_proto_unsetenv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_unsetenv" = xyes; then
@@ -39305,28 +40043,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_unsetenv=yes
   kde_cv_proto_unsetenv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_unsetenv="unsetenv unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -39340,8 +40082,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+$as_echo "$kde_cv_proto_unsetenv" >&6; }
 
 if test "x$kde_cv_func_unsetenv" = xyes; then
 
@@ -39365,10 +40107,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for random" >&5
-echo $ECHO_N "checking for random... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for random" >&5
+$as_echo_n "checking for random... " >&6; }
 if test "${kde_cv_func_random+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -39384,9 +40126,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
@@ -39416,20 +40155,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_random=no
@@ -39448,13 +40188,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
-echo "${ECHO_T}$kde_cv_func_random" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
+$as_echo "$kde_cv_func_random" >&6; }
 
-{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
-echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
+$as_echo_n "checking if random needs custom prototype... " >&6; }
 if test "${kde_cv_proto_random+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_random" = xyes; then
@@ -39515,28 +40255,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_random=yes
   kde_cv_proto_random=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_random="random unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -39550,8 +40294,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
-echo "${ECHO_T}$kde_cv_proto_random" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
+$as_echo "$kde_cv_proto_random" >&6; }
 
 if test "x$kde_cv_func_random" = xyes; then
 
@@ -39574,10 +40318,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for srandom" >&5
-echo $ECHO_N "checking for srandom... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for srandom" >&5
+$as_echo_n "checking for srandom... " >&6; }
 if test "${kde_cv_func_srandom+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -39593,9 +40337,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
@@ -39625,20 +40366,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_srandom=no
@@ -39657,13 +40399,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
-echo "${ECHO_T}$kde_cv_func_srandom" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
+$as_echo "$kde_cv_func_srandom" >&6; }
 
-{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
-echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
+$as_echo_n "checking if srandom needs custom prototype... " >&6; }
 if test "${kde_cv_proto_srandom+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_srandom" = xyes; then
@@ -39724,28 +40466,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_srandom=yes
   kde_cv_proto_srandom=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_srandom="srandom unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -39759,8 +40505,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
-echo "${ECHO_T}$kde_cv_proto_srandom" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
+$as_echo "$kde_cv_proto_srandom" >&6; }
 
 if test "x$kde_cv_func_srandom" = xyes; then
 
@@ -39785,10 +40531,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for mkstemps" >&5
-echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for mkstemps" >&5
+$as_echo_n "checking for mkstemps... " >&6; }
 if test "${kde_cv_func_mkstemps+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -39804,9 +40550,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
@@ -39837,20 +40580,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_mkstemps=no
@@ -39869,13 +40613,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
-echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
+$as_echo "$kde_cv_func_mkstemps" >&6; }
 
-{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
-echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
+$as_echo_n "checking if mkstemps needs custom prototype... " >&6; }
 if test "${kde_cv_proto_mkstemps+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_mkstemps" = xyes; then
@@ -39937,28 +40681,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_mkstemps=yes
   kde_cv_proto_mkstemps=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_mkstemps="mkstemps unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -39972,8 +40720,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
-echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
+$as_echo "$kde_cv_proto_mkstemps" >&6; }
 
 if test "x$kde_cv_func_mkstemps" = xyes; then
 
@@ -39997,10 +40745,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for mkstemp" >&5
-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for mkstemp" >&5
+$as_echo_n "checking for mkstemp... " >&6; }
 if test "${kde_cv_func_mkstemp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -40016,9 +40764,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
@@ -40049,20 +40794,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_mkstemp=no
@@ -40081,13 +40827,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemp" >&5
-echo "${ECHO_T}$kde_cv_func_mkstemp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_mkstemp" >&5
+$as_echo "$kde_cv_func_mkstemp" >&6; }
 
-{ echo "$as_me:$LINENO: checking if mkstemp needs custom prototype" >&5
-echo $ECHO_N "checking if mkstemp needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if mkstemp needs custom prototype" >&5
+$as_echo_n "checking if mkstemp needs custom prototype... " >&6; }
 if test "${kde_cv_proto_mkstemp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_mkstemp" = xyes; then
@@ -40149,28 +40895,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_mkstemp=yes
   kde_cv_proto_mkstemp=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_mkstemp="mkstemp unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -40184,8 +40934,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemp" >&5
-echo "${ECHO_T}$kde_cv_proto_mkstemp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemp" >&5
+$as_echo "$kde_cv_proto_mkstemp" >&6; }
 
 if test "x$kde_cv_func_mkstemp" = xyes; then
 
@@ -40209,10 +40959,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for mkdtemp" >&5
-echo $ECHO_N "checking for mkdtemp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for mkdtemp" >&5
+$as_echo_n "checking for mkdtemp... " >&6; }
 if test "${kde_cv_func_mkdtemp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -40228,9 +40978,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
@@ -40261,20 +41008,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_mkdtemp=no
@@ -40293,13 +41041,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_mkdtemp" >&5
-echo "${ECHO_T}$kde_cv_func_mkdtemp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_mkdtemp" >&5
+$as_echo "$kde_cv_func_mkdtemp" >&6; }
 
-{ echo "$as_me:$LINENO: checking if mkdtemp needs custom prototype" >&5
-echo $ECHO_N "checking if mkdtemp needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if mkdtemp needs custom prototype" >&5
+$as_echo_n "checking if mkdtemp needs custom prototype... " >&6; }
 if test "${kde_cv_proto_mkdtemp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_mkdtemp" = xyes; then
@@ -40361,28 +41109,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_mkdtemp=yes
   kde_cv_proto_mkdtemp=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_mkdtemp="mkdtemp unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -40396,8 +41148,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkdtemp" >&5
-echo "${ECHO_T}$kde_cv_proto_mkdtemp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_mkdtemp" >&5
+$as_echo "$kde_cv_proto_mkdtemp" >&6; }
 
 if test "x$kde_cv_func_mkdtemp" = xyes; then
 
@@ -40428,13 +41180,15 @@
 
 
 
-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
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -40487,35 +41241,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -40527,10 +41288,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for usleep" >&5
-echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for usleep" >&5
+$as_echo_n "checking for usleep... " >&6; }
 if test "${kde_cv_func_usleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -40546,9 +41307,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
@@ -40578,20 +41336,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_usleep=no
@@ -40610,13 +41369,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
-echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+$as_echo "$kde_cv_func_usleep" >&6; }
 
-{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+$as_echo_n "checking if usleep needs custom prototype... " >&6; }
 if test "${kde_cv_proto_usleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_usleep" = xyes; then
@@ -40677,28 +41436,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_usleep=yes
   kde_cv_proto_usleep=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_usleep="usleep unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -40712,8 +41475,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
-echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+$as_echo "$kde_cv_proto_usleep" >&6; }
 
 if test "x$kde_cv_func_usleep" = xyes; then
 
@@ -40737,10 +41500,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for gethostname" >&5
-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for gethostname" >&5
+$as_echo_n "checking for gethostname... " >&6; }
 if test "${kde_cv_func_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -40756,9 +41519,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
@@ -40790,20 +41550,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_gethostname=no
@@ -40822,13 +41583,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
-echo "${ECHO_T}$kde_cv_func_gethostname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
+$as_echo "$kde_cv_func_gethostname" >&6; }
 
-{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
-echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
+$as_echo_n "checking if gethostname needs custom prototype... " >&6; }
 if test "${kde_cv_proto_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_gethostname" = xyes; then
@@ -40891,28 +41652,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_gethostname=yes
   kde_cv_proto_gethostname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_gethostname="gethostname unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -40926,8 +41691,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
-echo "${ECHO_T}$kde_cv_proto_gethostname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
+$as_echo "$kde_cv_proto_gethostname" >&6; }
 
 if test "x$kde_cv_func_gethostname" = xyes; then
 
@@ -40951,10 +41716,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for random" >&5
-echo $ECHO_N "checking for random... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for random" >&5
+$as_echo_n "checking for random... " >&6; }
 if test "${kde_cv_func_random+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -40970,9 +41735,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
@@ -41002,20 +41764,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_random=no
@@ -41034,13 +41797,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
-echo "${ECHO_T}$kde_cv_func_random" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
+$as_echo "$kde_cv_func_random" >&6; }
 
-{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
-echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
+$as_echo_n "checking if random needs custom prototype... " >&6; }
 if test "${kde_cv_proto_random+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_random" = xyes; then
@@ -41101,28 +41864,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_random=yes
   kde_cv_proto_random=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_random="random unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -41136,8 +41903,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
-echo "${ECHO_T}$kde_cv_proto_random" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
+$as_echo "$kde_cv_proto_random" >&6; }
 
 if test "x$kde_cv_func_random" = xyes; then
 
@@ -41160,10 +41927,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for srandom" >&5
-echo $ECHO_N "checking for srandom... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for srandom" >&5
+$as_echo_n "checking for srandom... " >&6; }
 if test "${kde_cv_func_srandom+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -41179,9 +41946,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
@@ -41211,20 +41975,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_srandom=no
@@ -41243,13 +42008,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
-echo "${ECHO_T}$kde_cv_func_srandom" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
+$as_echo "$kde_cv_func_srandom" >&6; }
 
-{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
-echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
+$as_echo_n "checking if srandom needs custom prototype... " >&6; }
 if test "${kde_cv_proto_srandom+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_srandom" = xyes; then
@@ -41310,28 +42075,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_srandom=yes
   kde_cv_proto_srandom=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_srandom="srandom unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -41345,8 +42114,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
-echo "${ECHO_T}$kde_cv_proto_srandom" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
+$as_echo "$kde_cv_proto_srandom" >&6; }
 
 if test "x$kde_cv_func_srandom" = xyes; then
 
@@ -41370,10 +42139,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
-echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
+$as_echo_n "checking for S_ISSOCK... " >&6; }
 if test "${ac_cv_have_s_issock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -41402,33 +42171,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_have_s_issock=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_s_issock=no
 fi
 
+rm -rf conftest.dSYM
 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_have_s_issock" >&5
-echo "${ECHO_T}$ac_cv_have_s_issock" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5
+$as_echo "$ac_cv_have_s_issock" >&6; }
 if test "$ac_cv_have_s_issock" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -41443,10 +42216,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for initgroups" >&5
-echo $ECHO_N "checking for initgroups... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for initgroups" >&5
+$as_echo_n "checking for initgroups... " >&6; }
 if test "${kde_cv_func_initgroups+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -41462,9 +42235,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
@@ -41497,20 +42267,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_initgroups=no
@@ -41529,13 +42300,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_func_initgroups" >&5
-echo "${ECHO_T}$kde_cv_func_initgroups" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_initgroups" >&5
+$as_echo "$kde_cv_func_initgroups" >&6; }
 
-{ echo "$as_me:$LINENO: checking if initgroups needs custom prototype" >&5
-echo $ECHO_N "checking if initgroups needs custom prototype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if initgroups needs custom prototype" >&5
+$as_echo_n "checking if initgroups needs custom prototype... " >&6; }
 if test "${kde_cv_proto_initgroups+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "x$kde_cv_func_initgroups" = xyes; then
@@ -41599,28 +42370,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    kde_cv_func_initgroups=yes
   kde_cv_proto_initgroups=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_initgroups="initgroups unavailable"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -41634,8 +42409,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_proto_initgroups" >&5
-echo "${ECHO_T}$kde_cv_proto_initgroups" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_initgroups" >&5
+$as_echo "$kde_cv_proto_initgroups" >&6; }
 
 if test "x$kde_cv_func_initgroups" = xyes; then
 
@@ -41658,10 +42433,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for mount tab file" >&5
-echo $ECHO_N "checking for mount tab file... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for mount tab file" >&5
+$as_echo_n "checking for mount tab file... " >&6; }
 if test "${kde_cv_mtab_file+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     kde_cv_mtab_file=no
@@ -41681,8 +42456,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_mtab_file" >&5
-echo "${ECHO_T}$kde_cv_mtab_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_mtab_file" >&5
+$as_echo "$kde_cv_mtab_file" >&6; }
 if test "$kde_cv_mtab_file" != "no"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -41706,8 +42481,8 @@
 ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 
 
-{ echo "$as_me:$LINENO: checking if getmntinfo() uses struct statvfs" >&5
-echo $ECHO_N "checking if getmntinfo() uses struct statvfs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if getmntinfo() uses struct statvfs" >&5
+$as_echo_n "checking if getmntinfo() uses struct statvfs... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41731,33 +42506,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
-#define GETMNTINFO_USES_STATVFS
+#define GETMNTINFO_USES_STATVFS /**/
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 ac_ext=c
@@ -41810,21 +42589,21 @@
 
 
 
-{ echo "$as_me:$LINENO: checking if sendfile() is wanted" >&5
-echo $ECHO_N "checking if sendfile() is wanted... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if sendfile() is wanted" >&5
+$as_echo_n "checking if sendfile() is wanted... " >&6; }
 # Check whether --enable-sendfile was given.
 if test "${enable_sendfile+set}" = set; then
   enableval=$enable_sendfile; if test "$enableval" = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   want_sendfile="yes"
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -41837,21 +42616,21 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking if MIT-SHM support is wanted" >&5
-echo $ECHO_N "checking if MIT-SHM support is wanted... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if MIT-SHM support is wanted" >&5
+$as_echo_n "checking if MIT-SHM support is wanted... " >&6; }
 # Check whether --enable-mitshm was given.
 if test "${enable_mitshm+set}" = set; then
   enableval=$enable_mitshm; if test "$enableval" = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   want_mitshm="yes"
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 else
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }; want_mitshm="yes"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }; want_mitshm="yes"
 fi
 
 
@@ -41864,10 +42643,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for posix_fadvise" >&5
-echo $ECHO_N "checking for posix_fadvise... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for posix_fadvise" >&5
+$as_echo_n "checking for posix_fadvise... " >&6; }
 if test "${ac_cv_func_posix_fadvise+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -41920,32 +42699,36 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_posix_fadvise=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_posix_fadvise=no
 fi
 
+rm -rf conftest.dSYM
 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
-echo "${ECHO_T}$ac_cv_func_posix_fadvise" >&6; }
-if test $ac_cv_func_posix_fadvise = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_posix_fadvise" >&5
+$as_echo "$ac_cv_func_posix_fadvise" >&6; }
+if test "x$ac_cv_func_posix_fadvise" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FADVISE 1
@@ -41975,11 +42758,11 @@
 
 for ac_func in _IceTransNoListen
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42032,35 +42815,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -42087,8 +42877,8 @@
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for Compiler version" >&5
-echo $ECHO_N "checking for Compiler version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Compiler version" >&5
+$as_echo_n "checking for Compiler version... " >&6; }
 case "$CXX" in
 xlC*)
   # The __IBMCPP__ macro contains the C++ compiler version in decimal notation.
@@ -42128,11 +42918,11 @@
 #define KDE_COMPILER_VERSION "$clean_compiler_version"
 _ACEOF
 
-{ echo "$as_me:$LINENO: result: $clean_compiler_version" >&5
-echo "${ECHO_T}$clean_compiler_version" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $clean_compiler_version" >&5
+$as_echo "$clean_compiler_version" >&6; }
 
-{ echo "$as_me:$LINENO: checking for uname" >&5
-echo $ECHO_N "checking for uname... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for uname" >&5
+$as_echo_n "checking for uname... " >&6; }
 case `uname -s` in
 AIX)
   IBM_ARCH=PowerPC #good default
@@ -42153,11 +42943,11 @@
 #define KDE_COMPILING_OS "$uname_string"
 _ACEOF
 
-{ echo "$as_me:$LINENO: result: $uname_string" >&5
-echo "${ECHO_T}$uname_string" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $uname_string" >&5
+$as_echo "$uname_string" >&6; }
 
-{ echo "$as_me:$LINENO: checking for distribution channel" >&5
-echo $ECHO_N "checking for distribution channel... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for distribution channel" >&5
+$as_echo_n "checking for distribution channel... " >&6; }
 
 # Check whether --with-distribution was given.
 if test "${with_distribution+set}" = set; then
@@ -42172,8 +42962,8 @@
 #define KDE_DISTRIBUTION_TEXT "$kde_distribution_text"
 _ACEOF
 
-{ echo "$as_me:$LINENO: result: $kde_distribution_text" >&5
-echo "${ECHO_T}$kde_distribution_text" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_distribution_text" >&5
+$as_echo "$kde_distribution_text" >&6; }
 
 
 # Check whether --with-utempter was given.
@@ -42185,10 +42975,10 @@
 
 if test "x$with_utempter" != xno; then
   kde_have_utempter=yes
-  { echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
-echo $ECHO_N "checking for addToUtmp in -lutempter... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
+$as_echo_n "checking for addToUtmp in -lutempter... " >&6; }
 if test "${ac_cv_lib_utempter_addToUtmp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutempter  $LIBS"
@@ -42220,33 +43010,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_utempter_addToUtmp=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_utempter_addToUtmp=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utempter_addToUtmp" >&5
-echo "${ECHO_T}$ac_cv_lib_utempter_addToUtmp" >&6; }
-if test $ac_cv_lib_utempter_addToUtmp = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_utempter_addToUtmp" >&5
+$as_echo "$ac_cv_lib_utempter_addToUtmp" >&6; }
+if test "x$ac_cv_lib_utempter_addToUtmp" = x""yes; then
   LIBUTEMPTER=-lutempter
 else
   kde_have_utempter=no
@@ -42261,15 +43055,15 @@
 
   fi
   if test "x$with_utempter" != xcheck && test "x$kde_have_utempter" != xyes; then
-    { { echo "$as_me:$LINENO: error: --with-utempter was given, but test for utempter failed" >&5
-echo "$as_me: error: --with-utempter was given, but test for utempter failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --with-utempter was given, but test for utempter failed" >&5
+$as_echo "$as_me: error: --with-utempter was given, but test for utempter failed" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
 
 
-{ echo "$as_me:$LINENO: checking for Qt docs" >&5
-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Qt docs" >&5
+$as_echo_n "checking for Qt docs... " >&6; }
 kde_qtdir=
 if test "${with_qt_dir+set}" = set; then
   kde_qtdir="$with_qt_dir"
@@ -42281,7 +43075,7 @@
 do
   for j in qsql.html;
   do
-    echo "configure: 42284: $i/$j" >&5
+    echo "configure: 43078: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       QTDOCDIR=$i
@@ -42290,21 +43084,21 @@
   done
 done
 
-{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-echo "${ECHO_T}$QTDOCDIR" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+$as_echo "$QTDOCDIR" >&6; }
 
 
 
 
-   { echo "$as_me:$LINENO: checking for dot" >&5
-echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for dot" >&5
+$as_echo_n "checking for dot... " >&6; }
    if test -n "$DOT"; then
         kde_cv_path="$DOT";
    else
         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -42346,12 +43140,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       DOT=$kde_cv_path
 
    fi
@@ -42363,15 +43157,15 @@
 fi
 
 
-   { echo "$as_me:$LINENO: checking for doxygen" >&5
-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for doxygen" >&5
+$as_echo_n "checking for doxygen... " >&6; }
    if test -n "$DOXYGEN"; then
         kde_cv_path="$DOXYGEN";
    else
         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -42413,12 +43207,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       DOXYGEN=$kde_cv_path
 
    fi
@@ -42438,8 +43232,8 @@
 
 
 
-  { echo "$as_me:$LINENO: checking if ld supports unversioned version maps" >&5
-echo $ECHO_N "checking if ld supports unversioned version maps... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ld supports unversioned version maps" >&5
+$as_echo_n "checking if ld supports unversioned version maps... " >&6; }
 
   kde_save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
@@ -42473,26 +43267,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_supports_versionmaps=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_supports_versionmaps=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LDFLAGS="$kde_save_LDFLAGS"
@@ -42506,8 +43304,8 @@
 fi
 
 
-  { echo "$as_me:$LINENO: result: $kde_supports_versionmaps" >&5
-echo "${ECHO_T}$kde_supports_versionmaps" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $kde_supports_versionmaps" >&5
+$as_echo "$kde_supports_versionmaps" >&6; }
 
 
 
@@ -42519,14 +43317,14 @@
 ARTS_HAVE_VERSION=none
 ARTS_HAVE_PREFIX=none
 
-{ echo "$as_me:$LINENO: checking for aRts-$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR" >&5
-echo $ECHO_N "checking for aRts-$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for aRts-$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR" >&5
+$as_echo_n "checking for aRts-$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR... " >&6; }
 
 ARTS_OK=no
 
 if test "$build_arts" != "yes"; then
-  { echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6; }
+  { $as_echo "$as_me:$LINENO: result: disabled" >&5
+$as_echo "disabled" >&6; }
 else
 
   if test "x$ARTSCCONFIG" != "xno"; then
@@ -42545,13 +43343,13 @@
   	if test "x$realartsprefix" = "x$realprefix"; then
   		ARTS_OK=yes
   	else
-  { { echo "$as_me:$LINENO: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not installed in the same prefix as KDE!
+  { { $as_echo "$as_me:$LINENO: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not installed in the same prefix as KDE!
 Please reinstall aRts in the same prefix as KDE, different prefixes are not
 supported right now.
 
 (kdelibs prefix is $prefix, aRts prefix is $ARTS_HAVE_PREFIX)
   " >&5
-echo "$as_me: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not installed in the same prefix as KDE!
+$as_echo "$as_me: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not installed in the same prefix as KDE!
 Please reinstall aRts in the same prefix as KDE, different prefixes are not
 supported right now.
 
@@ -42561,11 +43359,11 @@
 	fi
   fi
 
-  { echo "$as_me:$LINENO: result: $ARTS_OK" >&5
-echo "${ECHO_T}$ARTS_OK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ARTS_OK" >&5
+$as_echo "$ARTS_OK" >&6; }
 
   if test "x$ARTS_OK" = "xno"; then
-  { { echo "$as_me:$LINENO: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
+  { { $as_echo "$as_me:$LINENO: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
 
 You'll need to install a suitable version of aRts in the same prefix as KDE
 before you build kdelibs.
@@ -42577,7 +43375,7 @@
  * aRts version: $ARTS_HAVE_VERSION (required: $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR)
 )
 " >&5
-echo "$as_me: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
+$as_echo "$as_me: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
 
 You'll need to install a suitable version of aRts in the same prefix as KDE
 before you build kdelibs.
@@ -42611,10 +43409,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MD5SUM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MD5SUM in
   [\\/]* | ?:[\\/]*)
@@ -42629,7 +43427,7 @@
   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_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -42641,11 +43439,11 @@
 fi
 MD5SUM=$ac_cv_path_MD5SUM
 if test -n "$MD5SUM"; then
-  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
-echo "${ECHO_T}$MD5SUM" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MD5SUM" >&5
+$as_echo "$MD5SUM" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -42656,105 +43454,285 @@
 
 #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
+# Check for pkg-config manually first, as if its not installed the
+# PKG_PROG_PKG_CONFIG macro won't be defined.
+
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_have_pkg_config+set}" = set; then
+  $as_echo_n "(cached) " >&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"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_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
+  { $as_echo "$as_me:$LINENO: result: $have_pkg_config" >&5
+$as_echo "$have_pkg_config" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "$with_dnssd" = "yes"; then
-{ echo "$as_me:$LINENO: checking for DNS-SD support" >&5
-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; }
-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.  */
 
-			#include <dns_sd.h>
 
-int
-main ()
-{
+if test x"$have_pkg_config" == xno; then
+    { { $as_echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
+$as_echo "$as_me: error: pkg-config is required to install this program" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-			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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
 
+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
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&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"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNSSD 1
-_ACEOF
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-			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; }
 
+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
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  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"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-			{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                        LIB_DNSSD=""
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&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
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-CPPFLAGS=$save_dnssdtest_CPPFLAGS
-LDFLAGS=$save_dnssdtest_LDFLAGS
-LIBS=$save_dnssdtest_LIBS
 fi
 
- if test "$have_libdns_sd" = "yes"; then
-  HAVE_DNSSD_TRUE=
-  HAVE_DNSSD_FALSE='#'
+
+  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
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&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"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  HAVE_DNSSD_TRUE='#'
-  HAVE_DNSSD_FALSE=
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "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
+        { $as_echo "$as_me:$LINENO: checking for  avahi-qt3 >= 0.4 " >&5
+$as_echo_n "checking for  avahi-qt3 >= 0.4 ... " >&6; }
+
+        if $PKG_CONFIG --exists " avahi-qt3 >= 0.4 , avahi-client >= 0.4 " ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
+
+            { $as_echo "$as_me:$LINENO: checking AVAHI_CFLAGS" >&5
+$as_echo_n "checking AVAHI_CFLAGS... " >&6; }
+            AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
+            { $as_echo "$as_me:$LINENO: result: $AVAHI_CFLAGS" >&5
+$as_echo "$AVAHI_CFLAGS" >&6; }
+
+            { $as_echo "$as_me:$LINENO: checking AVAHI_LIBS" >&5
+$as_echo_n "checking AVAHI_LIBS... " >&6; }
+            AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
+            { $as_echo "$as_me:$LINENO: result: $AVAHI_LIBS" >&5
+$as_echo "$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
+     { { $as_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
+$as_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" && \
+    { ($as_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=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define AVAHI_API_0_6 1
+_ACEOF
+
+fi
+
 
 
 
@@ -42796,20 +43774,20 @@
 
 
     if test "x$with_lua" = "xno"; then
-	{ echo "$as_me:$LINENO: result: Not using Lua" >&5
-echo "${ECHO_T}Not using Lua" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: Not using Lua" >&5
+$as_echo "Not using Lua" >&6; }
     else
         if ! test "x$LUA" = "x"; then
-                { echo "$as_me:$LINENO: result: using Lua from $LUA" >&5
-echo "${ECHO_T}using Lua from $LUA" >&6; }
+                { $as_echo "$as_me:$LINENO: result: using Lua from $LUA" >&5
+$as_echo "using Lua from $LUA" >&6; }
         fi
         if ! test "x$LUA_LIBS" = "x"; then
-                { echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5
-echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6; }
+                { $as_echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5
+$as_echo "using Lua libraries in $LUA_LIBS" >&6; }
         fi
         if ! test "x$LUA_INCLUDES" = "x"; then
-                { echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5
-echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6; }
+                { $as_echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5
+$as_echo "using Lua includes in $LUA_INCLUDES" >&6; }
         fi
 
                 ac_save_CFLAGS="$CFLAGS"
@@ -42821,17 +43799,17 @@
 
         LUAH_FOUND=""
         if test "${ac_cv_header_lua_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for lua.h" >&5
-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for lua.h" >&5
+$as_echo_n "checking for lua.h... " >&6; }
 if test "${ac_cv_header_lua_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
-echo "${ECHO_T}$ac_cv_header_lua_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
+$as_echo "$ac_cv_header_lua_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking lua.h usability" >&5
-echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lua.h usability" >&5
+$as_echo_n "checking lua.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42847,32 +43825,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking lua.h presence" >&5
-echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lua.h presence" >&5
+$as_echo_n "checking lua.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42886,87 +43865,88 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: lua.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: lua.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: lua.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: lua.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for lua.h" >&5
-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for lua.h" >&5
+$as_echo_n "checking for lua.h... " >&6; }
 if test "${ac_cv_header_lua_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_lua_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
-echo "${ECHO_T}$ac_cv_header_lua_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
+$as_echo "$ac_cv_header_lua_h" >&6; }
 
 fi
-if test $ac_cv_header_lua_h = yes; then
+if test "x$ac_cv_header_lua_h" = x""yes; then
   LUAH_FOUND="true"
 else
-   { echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5
-echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6; }
+   { $as_echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5
+$as_echo "lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6; }
 
 fi
 
 
 	LUALIBH_FOUND=""
         if test "${ac_cv_header_lualib_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for lualib.h" >&5
-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for lualib.h" >&5
+$as_echo_n "checking for lualib.h... " >&6; }
 if test "${ac_cv_header_lualib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
+$as_echo "$ac_cv_header_lualib_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking lualib.h usability" >&5
-echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lualib.h usability" >&5
+$as_echo_n "checking lualib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42982,32 +43962,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking lualib.h presence" >&5
-echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lualib.h presence" >&5
+$as_echo_n "checking lualib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43021,70 +44002,71 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: lualib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: lualib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: lualib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: lualib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for lualib.h" >&5
-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for lualib.h" >&5
+$as_echo_n "checking for lualib.h... " >&6; }
 if test "${ac_cv_header_lualib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_lualib_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
+$as_echo "$ac_cv_header_lualib_h" >&6; }
 
 fi
-if test $ac_cv_header_lualib_h = yes; then
+if test "x$ac_cv_header_lualib_h" = x""yes; then
   LUALIBH_FOUND="true"
 else
-   { echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5
-echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6; }
+   { $as_echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5
+$as_echo "lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6; }
 
 fi
 
@@ -43094,10 +44076,10 @@
         	if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then
 		LUA_LIBS=""
 	else
-	        { echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5
-echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6; }
+	        { $as_echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5
+$as_echo_n "checking for lua_version in -llua50... " >&6; }
 if test "${ac_cv_lib_lua50_lua_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llua50  $LIBS"
@@ -43129,39 +44111,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lua50_lua_version=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_lua50_lua_version=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lua50_lua_version" >&5
-echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6; }
-if test $ac_cv_lib_lua50_lua_version = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lua50_lua_version" >&5
+$as_echo "$ac_cv_lib_lua50_lua_version" >&6; }
+if test "x$ac_cv_lib_lua50_lua_version" = x""yes; then
   LUA_LIBS="$LUA_LIBS -llua50 -llualib50"
 else
-  { echo "$as_me:$LINENO: checking for lua_version in -llua" >&5
-echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for lua_version in -llua" >&5
+$as_echo_n "checking for lua_version in -llua... " >&6; }
 if test "${ac_cv_lib_lua_lua_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llua  $LIBS"
@@ -43193,38 +44179,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lua_lua_version=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_lua_lua_version=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lua_lua_version" >&5
-echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6; }
-if test $ac_cv_lib_lua_lua_version = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lua_lua_version" >&5
+$as_echo "$ac_cv_lib_lua_lua_version" >&6; }
+if test "x$ac_cv_lib_lua_lua_version" = x""yes; then
   LUA_LIBS="$LUA_LIBS -llua -llualib"
 else
   LUA_LIBS=""
-				 	{ echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5
-echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6; }
+				 	{ $as_echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5
+$as_echo "Lua 5.0 libraries were not found !" >&6; }
 
 fi
 
@@ -43273,8 +44263,8 @@
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking whether we can use openpty" >&5
-echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we can use openpty" >&5
+$as_echo_n "checking whether we can use openpty... " >&6; }
 # Check whether --enable-openpty was given.
 if test "${enable_openpty+set}" = set; then
   enableval=$enable_openpty; ac_use_openpty=$enableval
@@ -43286,11 +44276,13 @@
 	kde_safe_LIBS=$LIBS
 	LIBS="$LIBS $LIBUTIL"
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43317,29 +44309,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_use_openpty="yes"
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_use_openpty="no"
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -43352,11 +44347,11 @@
 #define HAVE_OPENPTY 1
 _ACEOF
 
-	{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -43375,20 +44370,21 @@
 
 for ac_header in idna.h punycode.h stringprep.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43404,32 +44400,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43443,69 +44440,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -43521,10 +44522,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for idna_to_ascii_4i in -lidn" >&5
-echo $ECHO_N "checking for idna_to_ascii_4i in -lidn... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for idna_to_ascii_4i in -lidn" >&5
+$as_echo_n "checking for idna_to_ascii_4i in -lidn... " >&6; }
 if test "${ac_cv_lib_idn_idna_to_ascii_4i+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lidn  $LIBS"
@@ -43556,33 +44557,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_idn_idna_to_ascii_4i=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_idn_idna_to_ascii_4i=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_idn_idna_to_ascii_4i" >&5
-echo "${ECHO_T}$ac_cv_lib_idn_idna_to_ascii_4i" >&6; }
-if test $ac_cv_lib_idn_idna_to_ascii_4i = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_idn_idna_to_ascii_4i" >&5
+$as_echo "$ac_cv_lib_idn_idna_to_ascii_4i" >&6; }
+if test "x$ac_cv_lib_idn_idna_to_ascii_4i" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBIDN 1
@@ -43596,8 +44601,8 @@
      LIBS="$kde_save_LIBS"
 
   if test "x$with_libidn" != xcheck && test -z "$LIB_IDN"; then
-    { { echo "$as_me:$LINENO: error: --with-libidn was given, but test for libidn failed" >&5
-echo "$as_me: error: --with-libidn was given, but test for libidn failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --with-libidn was given, but test for libidn failed" >&5
+$as_echo "$as_me: error: --with-libidn was given, but test for libidn failed" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -43624,11 +44629,11 @@
 
 for ac_func in inet_ntop inet_pton getpeername getsockname getsockopt gethostbyname2_r gethostbyname_r gethostbyname2 if_nametoindex getprotobyname_r getservbyname_r getservbyport_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43681,35 +44686,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -43719,10 +44731,10 @@
 
 if test "x$ac_cv_func_getservbyname_r" = "xyes"; then
 
-  { echo "$as_me:$LINENO: checking whether getservbyname_r is declared" >&5
-echo $ECHO_N "checking whether getservbyname_r is declared... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether getservbyname_r is declared" >&5
+$as_echo_n "checking whether getservbyname_r is declared... " >&6; }
 if test "${ac_cv_have_decl_getservbyname_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43749,20 +44761,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_getservbyname_r=no
@@ -43770,9 +44783,9 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getservbyname_r" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getservbyname_r" >&6; }
-if test $ac_cv_have_decl_getservbyname_r = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getservbyname_r" >&5
+$as_echo "$ac_cv_have_decl_getservbyname_r" >&6; }
+if test "x$ac_cv_have_decl_getservbyname_r" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_GETSERVBYNAME_R 1
@@ -43811,11 +44824,11 @@
 
 for ac_header in netinet/in.h net/if.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43833,20 +44846,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -43854,12 +44868,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -43892,20 +44909,21 @@
 
 for ac_header in sys/filio.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43921,32 +44939,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43960,69 +44979,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -44042,11 +45065,11 @@
 
 for ac_func in usleep poll madvise
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44099,47 +45122,55 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for struct addrinfo" >&5
-echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
+$as_echo_n "checking for struct addrinfo... " >&6; }
 if test "${ac_cv_type_struct_addrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_addrinfo=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -44147,14 +45178,46 @@
 /* end confdefs.h.  */
 $netincludes
 
-typedef struct addrinfo ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct addrinfo))
+       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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$netincludes
+
+int
+main ()
+{
+if (sizeof ((struct addrinfo)))
+	  return 0;
   ;
   return 0;
 }
@@ -44165,30 +45228,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_struct_addrinfo=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_addrinfo=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
-echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6; }
-if test $ac_cv_type_struct_addrinfo = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
+$as_echo "$ac_cv_type_struct_addrinfo" >&6; }
+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_ADDRINFO 1
@@ -44203,11 +45275,11 @@
 
 for ac_func in getaddrinfo
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44260,35 +45332,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
         kde_gai_ok=true
@@ -44297,11 +45376,11 @@
 
 for ac_func in freeaddrinfo getnameinfo gai_strerror
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44354,35 +45433,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  :
 else
@@ -44404,12 +45490,12 @@
 done
 
 
-    { echo "$as_me:$LINENO: checking if getaddrinfo works using numeric service with null host" >&5
-echo $ECHO_N "checking if getaddrinfo works using numeric service with null host... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking if getaddrinfo works using numeric service with null host" >&5
+$as_echo_n "checking if getaddrinfo works using numeric service with null host... " >&6; }
                         if test "$cross_compiling" = yes; then
 
-      { echo "$as_me:$LINENO: result: cross compiling. We hope so" >&5
-echo "${ECHO_T}cross compiling. We hope so" >&6; }
+      { $as_echo "$as_me:$LINENO: result: cross compiling. We hope so" >&5
+$as_echo "cross compiling. We hope so" >&6; }
 
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -44445,33 +45531,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_GETADDRINFO 1
@@ -44479,6 +45567,7 @@
 
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -44490,10 +45579,10 @@
 
 LIBS="$kde_safe_LIBS"
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+$as_echo_n "checking for struct sockaddr.sa_len... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44519,20 +45608,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -44559,20 +45649,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_sa_len=no
@@ -44583,9 +45674,9 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
-if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
@@ -44594,12 +45685,13 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
-echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_sockaddr_in6=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -44608,14 +45700,47 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-typedef struct sockaddr_in6 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct sockaddr_in6))
+       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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <netinet/in.h>
+
+int
+main ()
+{
+if (sizeof ((struct sockaddr_in6)))
+	  return 0;
   ;
   return 0;
 }
@@ -44626,39 +45751,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_struct_sockaddr_in6=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_sockaddr_in6=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockaddr_in6" >&6; }
-if test $ac_cv_type_struct_sockaddr_in6 = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
+$as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_IN6 1
 _ACEOF
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
-echo $ECHO_N "checking for struct sockaddr_in6.sin6_scope_id... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
+$as_echo_n "checking for struct sockaddr_in6.sin6_scope_id... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44684,20 +45818,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -44724,20 +45859,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
@@ -44748,9 +45884,9 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
-if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
@@ -44762,8 +45898,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for GLIBC function backtrace" >&5
-echo $ECHO_N "checking for GLIBC function backtrace... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for GLIBC function backtrace" >&5
+$as_echo_n "checking for GLIBC function backtrace... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44790,56 +45926,61 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_BACKTRACE 1
 _ACEOF
 
-	{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
 for ac_header in sys/mount.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44855,32 +45996,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44894,69 +46036,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -44981,15 +46127,15 @@
 
 if test "x$with_libart" != xno; then
 
-   { echo "$as_me:$LINENO: checking for libart2-config" >&5
-echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for libart2-config" >&5
+$as_echo_n "checking for libart2-config... " >&6; }
    if test -n "$LIBART_CONFIG"; then
         kde_cv_path="$LIBART_CONFIG";
    else
         kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -45031,15 +46177,15 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
-echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
+$as_echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       LIBART_CONFIG=$kde_cv_path
 
    fi
@@ -45069,13 +46215,13 @@
 _ACEOF
 
     else
-      { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
-echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
+$as_echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
     fi
   fi
   if test "x$with_libart" != xcheck && test -z "$LIBART_LIBS"; then
-    { { echo "$as_me:$LINENO: error: --with-libart was given, but test for libart failed" >&5
-echo "$as_me: error: --with-libart was given, but test for libart failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --with-libart was given, but test for libart failed" >&5
+$as_echo "$as_me: error: --with-libart was given, but test for libart failed" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -45102,20 +46248,21 @@
 
 for ac_header in sys/stropts.h sys/select.h libutil.h util.h termios.h pty.h termio.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45131,32 +46278,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45170,77 +46318,81 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for revoke(tty) in unistd.h" >&5
-echo $ECHO_N "checking for revoke(tty) in unistd.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for revoke(tty) in unistd.h" >&5
+$as_echo_n "checking for revoke(tty) in unistd.h... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45266,36 +46418,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_REVOKE 1
 _ACEOF
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -45326,8 +46482,8 @@
         if test "$kde_fast_malloc" = "notgiven"; then
             kde_fast_malloc=no
         else
-            { { echo "$as_me:$LINENO: error: Fast malloc needs GCC." >&5
-echo "$as_me: error: Fast malloc needs GCC." >&2;}
+            { { $as_echo "$as_me:$LINENO: error: Fast malloc needs GCC." >&5
+$as_echo "$as_me: error: Fast malloc needs GCC." >&2;}
    { (exit 1); exit 1; }; }
             kde_fast_malloc=no
         fi
@@ -45347,8 +46503,8 @@
             if test "$kde_fast_malloc" = "notgiven"; then
                 kde_fast_malloc=no
             else
-                { { echo "$as_me:$LINENO: error: Fast malloc is not supported on this platform (missing spinlock implementation)." >&5
-echo "$as_me: error: Fast malloc is not supported on this platform (missing spinlock implementation)." >&2;}
+                { { $as_echo "$as_me:$LINENO: error: Fast malloc is not supported on this platform (missing spinlock implementation)." >&5
+$as_echo "$as_me: error: Fast malloc is not supported on this platform (missing spinlock implementation)." >&2;}
    { (exit 1); exit 1; }; }
             fi
             ;;
@@ -45360,18 +46516,18 @@
             if test "$kde_fast_malloc" = "notgiven"; then
                 kde_fast_malloc=no
             else
-                { echo "$as_me:$LINENO: WARNING: Fast malloc is not tested on this platform. The build may fail or the executables may crash." >&5
-echo "$as_me: WARNING: Fast malloc is not tested on this platform. The build may fail or the executables may crash." >&2;}
+                { $as_echo "$as_me:$LINENO: WARNING: Fast malloc is not tested on this platform. The build may fail or the executables may crash." >&5
+$as_echo "$as_me: WARNING: Fast malloc is not tested on this platform. The build may fail or the executables may crash." >&2;}
             fi
             ;;
     esac
 fi
 
 if test "$kde_fast_malloc" = "yes" -o "$kde_fast_malloc" = "notgiven" -o "$kde_fast_malloc" = "debug"; then
-    { echo "$as_me:$LINENO: checking if the libc is glibc" >&5
-echo $ECHO_N "checking if the libc is glibc... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking if the libc is glibc" >&5
+$as_echo_n "checking if the libc is glibc... " >&6; }
 if test "${kde_cv_libc_glibc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -45398,20 +46554,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_libc_glibc=no
@@ -45420,8 +46577,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $kde_cv_libc_glibc" >&5
-echo "${ECHO_T}$kde_cv_libc_glibc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_libc_glibc" >&5
+$as_echo "$kde_cv_libc_glibc" >&6; }
     if test "$kde_cv_libc_glibc" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -45432,12 +46589,12 @@
         if test "$kde_fast_malloc" = "notgiven"; then
             kde_fast_malloc=notgiven_full
         elif test "$enableval" = "debug"; then
-            { echo "$as_me:$LINENO: WARNING: This libc is not supported for fast malloc. Runtime disabling won't work." >&5
-echo "$as_me: WARNING: This libc is not supported for fast malloc. Runtime disabling won't work." >&2;}
+            { $as_echo "$as_me:$LINENO: WARNING: This libc is not supported for fast malloc. Runtime disabling won't work." >&5
+$as_echo "$as_me: WARNING: This libc is not supported for fast malloc. Runtime disabling won't work." >&2;}
             kde_fast_malloc=debug_full
         else
-            { { echo "$as_me:$LINENO: error: This libc is not supported for fast malloc. Either use --enable-fast-malloc=full, or don't use it at all." >&5
-echo "$as_me: error: This libc is not supported for fast malloc. Either use --enable-fast-malloc=full, or don't use it at all." >&2;}
+            { { $as_echo "$as_me:$LINENO: error: This libc is not supported for fast malloc. Either use --enable-fast-malloc=full, or don't use it at all." >&5
+$as_echo "$as_me: error: This libc is not supported for fast malloc. Either use --enable-fast-malloc=full, or don't use it at all." >&2;}
    { (exit 1); exit 1; }; }
         fi
     fi
@@ -45456,23 +46613,23 @@
     fi
 fi
 
-{ echo "$as_me:$LINENO: checking whether to enable fast malloc" >&5
-echo $ECHO_N "checking whether to enable fast malloc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable fast malloc" >&5
+$as_echo_n "checking whether to enable fast malloc... " >&6; }
 if test "$kde_fast_malloc" = "yes"; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 elif test "$kde_fast_malloc" = "full"; then
-    { echo "$as_me:$LINENO: result: yes(full)" >&5
-echo "${ECHO_T}yes(full)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes(full)" >&5
+$as_echo "yes(full)" >&6; }
 elif test "$kde_fast_malloc" = "debug"; then
-    { echo "$as_me:$LINENO: result: yes(debug)" >&5
-echo "${ECHO_T}yes(debug)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes(debug)" >&5
+$as_echo "yes(debug)" >&6; }
 elif test "$kde_fast_malloc" = "debug_full"; then
-    { echo "$as_me:$LINENO: result: yes(full+debug)" >&5
-echo "${ECHO_T}yes(full+debug)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes(full+debug)" >&5
+$as_echo "yes(full+debug)" >&6; }
 else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "$kde_fast_malloc" != "no"; then
@@ -45500,11 +46657,11 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -finline-limit=100000" >&5
-echo $ECHO_N "checking whether $CXX supports -finline-limit=100000... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -finline-limit=100000" >&5
+$as_echo_n "checking whether $CXX supports -finline-limit=100000... " >&6; }
 kde_cache=`echo finline-limit=100000 | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -45540,26 +46697,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -45573,13 +46734,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
  KDE_FORCE_INLINE="-finline-limit=100000"
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
  KDE_FORCE_INLINE=
 fi
@@ -45603,17 +46764,17 @@
 
 
    if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
-echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+$as_echo_n "checking X11/extensions/Xrender.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45629,32 +46790,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
-echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+$as_echo_n "checking X11/extensions/Xrender.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45668,66 +46830,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
 
 fi
-if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
+if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then
   xrender_h=yes
 else
   xrender_h=no
@@ -45752,10 +46915,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
-echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
+$as_echo_n "checking for XRenderComposite in -lXrender... " >&6; }
 if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrender -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@ -45787,33 +46950,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xrender_XRenderComposite=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_Xrender_XRenderComposite=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; }
-if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
+$as_echo "$ac_cv_lib_Xrender_XRenderComposite" >&6; }
+if test "x$ac_cv_lib_Xrender_XRenderComposite" = x""yes; then
   LIB_XRENDER=-lXrender
 
 cat >>confdefs.h <<_ACEOF
@@ -45832,8 +46999,8 @@
 
 case $host_cpu in
   i*86 )
-  { echo "$as_me:$LINENO: checking for assembler support for IA32 extensions" >&5
-echo $ECHO_N "checking for assembler support for IA32 extensions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for assembler support for IA32 extensions" >&5
+$as_echo_n "checking for assembler support for IA32 extensions... " >&6; }
 
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -45856,13 +47023,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -45876,7 +47044,7 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 echo $ECHO_N "MMX no$ECHO_C"
@@ -45905,13 +47073,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -45925,7 +47094,7 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 echo $ECHO_N ", SSE no$ECHO_C"
@@ -45954,13 +47123,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -45974,7 +47144,7 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 echo $ECHO_N ", SSE2 no$ECHO_C"
@@ -46003,13 +47173,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -46023,7 +47194,7 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 echo $ECHO_N ", 3DNOW no$ECHO_C"
@@ -46033,8 +47204,8 @@
   echo
   ;;
   powerpc )
-  { echo "$as_me:$LINENO: checking for assembler support for AltiVec instructions" >&5
-echo $ECHO_N "checking for assembler support for AltiVec instructions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for assembler support for AltiVec instructions" >&5
+$as_echo_n "checking for assembler support for AltiVec instructions... " >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46056,13 +47227,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -46076,7 +47248,7 @@
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 echo $ECHO_N ", AltiVec no$ECHO_C"
@@ -46107,13 +47279,13 @@
   ac_LDFLAGS_save="$LDFLAGS"
   LDFLAGS="$LDFLAGS $all_libraries"
   kde_cups_config=
-  kde_cups_libs="-lcups $LIBDL $LIBSOCKET"
+  kde_cups_libs="-lcups"
   # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_kde_cups_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $kde_cups_config in
   [\\/]* | ?:[\\/]*)
@@ -46128,7 +47300,7 @@
   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_kde_cups_config="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -46140,19 +47312,20 @@
 fi
 kde_cups_config=$ac_cv_path_kde_cups_config
 if test -n "$kde_cups_config"; then
-  { echo "$as_me:$LINENO: result: $kde_cups_config" >&5
-echo "${ECHO_T}$kde_cups_config" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $kde_cups_config" >&5
+$as_echo "$kde_cups_config" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   if test -n "$kde_cups_config"; then
-    kde_cups_libs=`$kde_cups_config --libs`
+#    kde_cups_libs=`$kde_cups_config --libs`
+    kde_cups_libs="$kde_cups_libs"
   else
-    { echo "$as_me:$LINENO: result: cups-config not found" >&5
-echo "${ECHO_T}cups-config not found" >&6; }
+    { $as_echo "$as_me:$LINENO: result: cups-config not found" >&5
+$as_echo "cups-config not found" >&6; }
   fi
 
      kde_save_LDFLAGS="$LDFLAGS"
@@ -46163,10 +47336,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for cupsServer in -lcups" >&5
-echo $ECHO_N "checking for cupsServer in -lcups... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for cupsServer in -lcups" >&5
+$as_echo_n "checking for cupsServer in -lcups... " >&6; }
 if test "${ac_cv_lib_cups_cupsServer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcups $LIBDL $LIBSOCKET $LIBS"
@@ -46198,33 +47371,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_cups_cupsServer=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_cups_cupsServer=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsServer" >&5
-echo "${ECHO_T}$ac_cv_lib_cups_cupsServer" >&6; }
-if test $ac_cv_lib_cups_cupsServer = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsServer" >&5
+$as_echo "$ac_cv_lib_cups_cupsServer" >&6; }
+if test "x$ac_cv_lib_cups_cupsServer" = x""yes; then
   ac_cups_libs=1
 else
   ac_cups_libs=0
@@ -46234,24 +47411,24 @@
      LIBS="$kde_save_LIBS"
 
   if test "$ac_cups_libs" = "0"; then
-    { echo "$as_me:$LINENO: WARNING: CUPS library not found. CUPS support disabled" >&5
-echo "$as_me: WARNING: CUPS library not found. CUPS support disabled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CUPS library not found. CUPS support disabled" >&5
+$as_echo "$as_me: WARNING: CUPS library not found. CUPS support disabled" >&2;}
     ac_use_cups="no"
   fi
   if test "$ac_use_cups" = "yes"; then
         ac_cups_headers=0
     if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+$as_echo_n "checking for cups/cups.h... " >&6; }
 if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+$as_echo "$ac_cv_header_cups_cups_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
-echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
+$as_echo_n "checking cups/cups.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46267,32 +47444,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
-echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
+$as_echo_n "checking cups/cups.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46306,73 +47484,74 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5
-echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+$as_echo_n "checking for cups/cups.h... " >&6; }
 if test "${ac_cv_header_cups_cups_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_cups_cups_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
-echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+$as_echo "$ac_cv_header_cups_cups_h" >&6; }
 
 fi
-if test $ac_cv_header_cups_cups_h = yes; then
+if test "x$ac_cv_header_cups_cups_h" = x""yes; then
   ac_cups_headers=1
 fi
 
 
     if test "$ac_cups_headers" = "0"; then
-      { echo "$as_me:$LINENO: WARNING: CUPS headers not found. CUPS support disabled" >&5
-echo "$as_me: WARNING: CUPS headers not found. CUPS support disabled" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: CUPS headers not found. CUPS support disabled" >&5
+$as_echo "$as_me: WARNING: CUPS headers not found. CUPS support disabled" >&2;}
       ac_use_cups="no"
     else
 
@@ -46380,8 +47559,8 @@
 kde_save_libs="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS $kde_cups_libs"
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-{ echo "$as_me:$LINENO: checking CUPS version >= 1.0109" >&5
-echo $ECHO_N "checking CUPS version >= 1.0109... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CUPS version >= 1.0109" >&5
+$as_echo_n "checking CUPS version >= 1.0109... " >&6; }
 kde_save_link=$ac_link
 ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
 cat > conftest.c <<EOF
@@ -46402,7 +47581,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -x conftest; then
   ac_have_new_cups=`./conftest`
 else
@@ -46412,12 +47591,12 @@
 ac_link="$kde_save_link"
 CFLAGS="$kde_save_cflags"
 LIBS="$kde_save_libs"
-{ echo "$as_me:$LINENO: result: $ac_have_new_cups" >&5
-echo "${ECHO_T}$ac_have_new_cups" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_have_new_cups" >&5
+$as_echo "$ac_have_new_cups" >&6; }
 
       if test "$ac_have_new_cups" = "no"; then
-        { echo "$as_me:$LINENO: WARNING: CUPS version too old. You should upgrade to version >= 1.1.9" >&5
-echo "$as_me: WARNING: CUPS version too old. You should upgrade to version >= 1.1.9" >&2;}
+        { $as_echo "$as_me:$LINENO: WARNING: CUPS version too old. You should upgrade to version >= 1.1.9" >&5
+$as_echo "$as_me: WARNING: CUPS version too old. You should upgrade to version >= 1.1.9" >&2;}
 	ac_use_cups="no"
       fi
 
@@ -46427,8 +47606,8 @@
 kde_save_libs="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS $kde_cups_libs"
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-{ echo "$as_me:$LINENO: checking CUPS version >= 1.0120" >&5
-echo $ECHO_N "checking CUPS version >= 1.0120... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CUPS version >= 1.0120" >&5
+$as_echo_n "checking CUPS version >= 1.0120... " >&6; }
 kde_save_link=$ac_link
 ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
 cat > conftest.c <<EOF
@@ -46449,7 +47628,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -x conftest; then
   ac_have_new_cups=`./conftest`
 else
@@ -46459,8 +47638,8 @@
 ac_link="$kde_save_link"
 CFLAGS="$kde_save_cflags"
 LIBS="$kde_save_libs"
-{ echo "$as_me:$LINENO: result: $ac_have_new_cups" >&5
-echo "${ECHO_T}$ac_have_new_cups" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_have_new_cups" >&5
+$as_echo "$ac_have_new_cups" >&6; }
 
       if test "$ac_have_new_cups" = "yes"; then
 
@@ -46493,8 +47672,8 @@
 
 
 
-{ echo "$as_me:$LINENO: checking installation of PS driver needed" >&5
-echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking installation of PS driver needed" >&5
+$as_echo_n "checking installation of PS driver needed... " >&6; }
 ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups"
 cups_modeldir=""
 for d in $ac_cups_share_test; do
@@ -46507,19 +47686,19 @@
 
 
 if test -n "$cups_modeldir"; then
-	{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 # Extract the first word of ""su"", so it can be a program name with args.
 set dummy "su"; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_path_su+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $path_su in
   [\\/]* | ?:[\\/]*)
@@ -46534,7 +47713,7 @@
   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_path_su="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -46547,17 +47726,17 @@
 fi
 path_su=$ac_cv_path_path_su
 if test -n "$path_su"; then
-  { echo "$as_me:$LINENO: result: $path_su" >&5
-echo "${ECHO_T}$path_su" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $path_su" >&5
+$as_echo "$path_su" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "$path_su" = "no"; then
-    { echo "$as_me:$LINENO: WARNING: su was not found" >&5
-echo "$as_me: WARNING: su was not found" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: su was not found" >&5
+$as_echo "$as_me: WARNING: su was not found" >&2;}
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -46568,10 +47747,10 @@
 
 # Extract the first word of ""sudo"", so it can be a program name with args.
 set dummy "sudo"; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_path_sudo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $path_sudo in
   [\\/]* | ?:[\\/]*)
@@ -46586,7 +47765,7 @@
   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_path_sudo="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -46599,17 +47778,17 @@
 fi
 path_sudo=$ac_cv_path_path_sudo
 if test -n "$path_sudo"; then
-  { echo "$as_me:$LINENO: result: $path_sudo" >&5
-echo "${ECHO_T}$path_sudo" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $path_sudo" >&5
+$as_echo "$path_sudo" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "$path_sudo" = "no"; then
-    { echo "$as_me:$LINENO: WARNING: sudo was not found" >&5
-echo "$as_me: WARNING: sudo was not found" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sudo was not found" >&5
+$as_echo "$as_me: WARNING: sudo was not found" >&2;}
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -46635,8 +47814,8 @@
 
 
 if test x$use_kdesu_backend = xsudo -a x$path_sudo = xno; then
-    { { echo "$as_me:$LINENO: error: sudo was chosen as kdesu backend" >&5
-echo "$as_me: error: sudo was chosen as kdesu backend" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: sudo was chosen as kdesu backend" >&5
+$as_echo "$as_me: error: sudo was chosen as kdesu backend" >&2;}
    { (exit but was not found in path.); exit but was not found in path.; }; }
 fi
 
@@ -46646,8 +47825,8 @@
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking POSIX.1b scheduling" >&5
-echo $ECHO_N "checking POSIX.1b scheduling... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking POSIX.1b scheduling" >&5
+$as_echo_n "checking POSIX.1b scheduling... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46673,26 +47852,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   have_rtsched="yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	have_rtsched="no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test "$have_rtsched" = "yes"; then
@@ -46701,21 +47884,21 @@
 #define POSIX1B_SCHEDULING 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 for ac_func in initgroups
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -46768,35 +47951,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -46808,20 +47998,21 @@
 
 for ac_header in libutil.h util.h pty.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46837,32 +48028,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46876,79 +48068,83 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
-echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
 if test "${ac_cv_lib_util_openpty+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
@@ -46980,33 +48176,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_util_openpty=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_util_openpty=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
-echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6; }
-if test $ac_cv_lib_util_openpty = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENPTY 1
@@ -47025,11 +48225,11 @@
 
 for ac_func in openpty initgroups setgroups getgroups grantpt setpriority getpt unlockpt ptsname
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -47082,35 +48282,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -47123,11 +48330,11 @@
 
 for ac_func in _getpty
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -47180,45 +48387,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for struct ucred" >&5
-echo $ECHO_N "checking for struct ucred... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct ucred" >&5
+$as_echo_n "checking for struct ucred... " >&6; }
 if test "${kde_cv_have_struct_ucred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   cat >conftest.$ac_ext <<_ACEOF
@@ -47246,20 +48460,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_have_struct_ucred=no
@@ -47270,8 +48485,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $kde_cv_have_struct_ucred" >&5
-echo "${ECHO_T}$kde_cv_have_struct_ucred" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_have_struct_ucred" >&5
+$as_echo "$kde_cv_have_struct_ucred" >&6; }
 if test "$kde_cv_have_struct_ucred" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -47282,11 +48497,11 @@
 
 for ac_func in getpeereid
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -47339,35 +48554,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -47379,15 +48601,15 @@
 HELP_SUBDIR=kdoctools
 
 
-   { echo "$as_me:$LINENO: checking for xml2-config" >&5
-echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for xml2-config" >&5
+$as_echo_n "checking for xml2-config... " >&6; }
    if test -n "$XML_CONFIG"; then
         kde_cv_path="$XML_CONFIG";
    else
         kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -47429,16 +48651,16 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-  { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+$as_echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
   HELP_SUBDIR=
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       XML_CONFIG=$kde_cv_path
 
    fi
@@ -47462,15 +48684,15 @@
      LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
 
 
-   { echo "$as_me:$LINENO: checking for xmllint" >&5
-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for xmllint" >&5
+$as_echo_n "checking for xmllint... " >&6; }
    if test -n "$XMLLINT"; then
         kde_cv_path="$XMLLINT";
    else
         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -47512,12 +48734,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
       XMLLINT=""
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       XMLLINT=$kde_cv_path
 
    fi
@@ -47528,8 +48750,8 @@
 _ACEOF
 
   else
-     { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
-echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
+     { $as_echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
+$as_echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
      HELP_SUBDIR=
   fi
 fi
@@ -47537,15 +48759,15 @@
 if test -n "$HELP_SUBDIR"; then
 
 
-   { echo "$as_me:$LINENO: checking for xslt-config" >&5
-echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for xslt-config" >&5
+$as_echo_n "checking for xslt-config... " >&6; }
    if test -n "$XSLT_CONFIG"; then
         kde_cv_path="$XSLT_CONFIG";
    else
         kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -47587,16 +48809,16 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+$as_echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
     HELP_SUBDIR=
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       XSLT_CONFIG=$kde_cv_path
 
    fi
@@ -47619,8 +48841,8 @@
        LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
 
      else
-       { echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
-echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
+       { $as_echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
+$as_echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
        HELP_SUBDIR=
      fi
   fi
@@ -47628,10 +48850,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
-echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
+$as_echo_n "checking for bzDecompress in libbz2... " >&6; }
 if test "${ac_cv_lib_bzip2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -47672,26 +48894,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_bzip2='-lbz2'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_bzip2=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -47704,8 +48930,8 @@
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
-echo "${ECHO_T}$ac_cv_lib_bzip2" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
+$as_echo "$ac_cv_lib_bzip2" >&6; }
 
 if test ! "$ac_cv_lib_bzip2" = no; then
   BZIP2DIR=bzip2
@@ -47718,11 +48944,11 @@
    cxx_shared_flag=
    ld_shared_flag=
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+$as_echo_n "checking whether $CXX supports -shared... " >&6; }
 kde_cache=`echo shared | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -47758,26 +48984,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -47791,25 +49021,25 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
 
 	ld_shared_flag="-shared"
 
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5
-echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5
+$as_echo_n "checking whether $CXX supports -fPIC... " >&6; }
 kde_cache=`echo fPIC | 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
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -47845,26 +49075,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -47878,24 +49112,24 @@
 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; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
  :
 
         cxx_shared_flag="-fPIC"
 
 else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
  :
 
 fi
 
 
-   { echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5
-echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5
+$as_echo_n "checking for BZ2_bzDecompress in (shared) libbz2... " >&6; }
    if test "${ac_cv_lib_bzip2_prefix+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -47937,26 +49171,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_bzip2_prefix='-lbz2'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_bzip2_prefix=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
    LIBS="$kde_save_LIBS"
@@ -47970,8 +49208,8 @@
 
 fi
 
-   { echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
-echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
+$as_echo "$ac_cv_lib_bzip2_prefix" >&6; }
 
    if test ! "$ac_cv_lib_bzip2_prefix" = no; then
      BZIP2DIR=bzip2
@@ -47998,15 +49236,15 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for present bzip2 support" >&5
-echo $ECHO_N "checking for present bzip2 support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for present bzip2 support" >&5
+$as_echo_n "checking for present bzip2 support... " >&6; }
 if test -z "$LIBBZ2"; then
-	{ echo "$as_me:$LINENO: result: no - disabling doc compiler" >&5
-echo "${ECHO_T}no - disabling doc compiler" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no - disabling doc compiler" >&5
+$as_echo "no - disabling doc compiler" >&6; }
 	HELP_SUBDIR=
 else
-	{ echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
 
@@ -48051,8 +49289,8 @@
 
 
 
-{ echo "$as_me:$LINENO: checking if libthai should be compiled in" >&5
-echo $ECHO_N "checking if libthai should be compiled in... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libthai should be compiled in" >&5
+$as_echo_n "checking if libthai should be compiled in... " >&6; }
 
 # Check whether --with-libthai was given.
 if test "${with_libthai+set}" = set; then
@@ -48065,7 +49303,7 @@
 
 if test "$ac_libthai" != "no"; then
   if test "${kde_link_libthai+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   kde_ldflags_safe="$LDFLAGS"
@@ -48103,27 +49341,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   kde_link_libthai=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_link_libthai=no
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -48135,8 +49377,8 @@
 
   LIBTHAI=""
   if test "$kde_link_libthai" = "no"; then
-     { { echo "$as_me:$LINENO: error: Can't find libthai." >&5
-echo "$as_me: error: Can't find libthai." >&2;}
+     { { $as_echo "$as_me:$LINENO: error: Can't find libthai." >&5
+$as_echo "$as_me: error: Can't find libthai." >&2;}
    { (exit 1); exit 1; }; }
   else
 
@@ -48148,8 +49390,8 @@
   fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_libthai" >&5
-echo "${ECHO_T}$ac_libthai" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_libthai" >&5
+$as_echo "$ac_libthai" >&6; }
 
 
 
@@ -48170,20 +49412,21 @@
 
 for ac_header in valgrind/memcheck.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -48199,32 +49442,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -48238,69 +49482,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -48343,11 +49591,11 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for libtiff tiff" >&5
-echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libtiff tiff" >&5
+$as_echo_n "checking for libtiff tiff... " >&6; }
 
 if test "${kde_cv_libtiff_tiff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -48392,23 +49640,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-    kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
+    kde_cv_libtiff_tiff="-ltiff"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -48416,6 +49667,7 @@
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -48432,15 +49684,15 @@
 
 
 if test "$kde_cv_libtiff_tiff" = "no"; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     LIBTIFF=""
 
-{ echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
-echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
+$as_echo_n "checking for libtiff tiff34... " >&6; }
 
 if test "${kde_cv_libtiff_tiff34+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -48485,23 +49737,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-    kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
+    kde_cv_libtiff_tiff34="-ltiff34"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -48509,6 +49764,7 @@
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -48525,14 +49781,14 @@
 
 
 if test "$kde_cv_libtiff_tiff34" = "no"; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     LIBTIFF=""
 
 else
     LIBTIFF="$kde_cv_libtiff_tiff34"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTIFF 1
@@ -48544,8 +49800,8 @@
 
 else
     LIBTIFF="$kde_cv_libtiff_tiff"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTIFF 1
@@ -48562,10 +49818,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+$as_echo_n "checking for libjpeg6b... " >&6; }
 if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -48601,26 +49857,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_6b=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -48631,16 +49891,16 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_6b"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+$as_echo "$ac_cv_lib_jpeg_6b" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
-{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -48676,26 +49936,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_normal=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -48706,11 +49970,11 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_normal"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+$as_echo "$ac_cv_lib_jpeg_normal" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
        LIBJPEG=
 
@@ -48730,7 +49994,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 48733: $i/$j" >&5
+    echo "configure: 49997: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -48749,14 +50013,14 @@
 
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    { echo "$as_me:$LINENO: WARNING:
+    { $as_echo "$as_me:$LINENO: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
 libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
 Disabling JPEG support.
 " >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
@@ -48764,8 +50028,8 @@
 Disabling JPEG support.
 " >&2;}
   else
-    { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
+$as_echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
   fi
   jpeg_incdir=
   LIBJPEG=
@@ -48778,10 +50042,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for libpng" >&5
-echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libpng" >&5
+$as_echo_n "checking for libpng... " >&6; }
 if test "${ac_cv_lib_png+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -48820,27 +50084,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_png=no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -48855,11 +50123,11 @@
 
   LIBPNG="$ac_cv_lib_png"
 
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+$as_echo "$ac_cv_lib_png" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   LIBPNG=""
 
 fi
@@ -48878,14 +50146,14 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for jasper" >&5
-echo $ECHO_N "checking for jasper... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for jasper" >&5
+$as_echo_n "checking for jasper... " >&6; }
 if test "${ac_cv_jasper+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
+LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
 kde_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
 
@@ -48914,27 +50182,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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'"
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "ac_cv_jasper='-ljasper -lm'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_jasper=no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -48948,11 +50220,11 @@
 _ACEOF
 
   LIB_JASPER="$ac_cv_jasper"
-  { echo "$as_me:$LINENO: result: $ac_cv_jasper" >&5
-echo "${ECHO_T}$ac_cv_jasper" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_jasper" >&5
+$as_echo "$ac_cv_jasper" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   LIB_JASPER=""
 fi
 
@@ -48973,16 +50245,16 @@
 
 
 if test "${ac_cv_libexr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -48997,7 +50269,7 @@
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -49010,39 +50282,40 @@
 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; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   fi
 
-  { echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
-echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
+$as_echo_n "checking for OpenEXR libraries... " >&6; }
 
   if test "$PKG_CONFIG" = "no" ; then
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
      echo "*** The pkg-config script could not be found. Make sure it is"
      echo "*** in your path, or set the PKG_CONFIG environment variable"
      echo "*** to the full path to pkg-config."
      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
      if ! $PKG_CONFIG --exists OpenEXR ; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         EXRSTATUS=no
      else
         if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
-           { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+           { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
+           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
 
             ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -49084,27 +50357,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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`'"
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "ac_cv_libexr='$kde_libexr_libs'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_libexr=no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
            LIBS="$kde_save_LIBS"
@@ -49123,12 +50400,12 @@
 #define HAVE_EXR 1
 _ACEOF
 
-               LIB_EXR="$ac_cv_libexr"
-               { echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
-echo "${ECHO_T}$ac_cv_libexr" >&6; }
+               LIB_EXR="$kde_libexr_libs"
+               { $as_echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
+$as_echo "$ac_cv_libexr" >&6; }
            else
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                LIB_EXR=""
            fi
         fi
@@ -49175,10 +50452,10 @@
 	;;
      esac
 
-{ echo "$as_me:$LINENO: checking for XftInit in -lqt-mt" >&5
-echo $ECHO_N "checking for XftInit in -lqt-mt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for XftInit in -lqt-mt" >&5
+$as_echo_n "checking for XftInit in -lqt-mt... " >&6; }
 if test "${ac_cv_lib_qt_mt_XftInit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lqt-mt  $LIBS"
@@ -49210,33 +50487,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_qt_mt_XftInit=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_qt_mt_XftInit=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_qt_mt_XftInit" >&5
-echo "${ECHO_T}$ac_cv_lib_qt_mt_XftInit" >&6; }
-if test $ac_cv_lib_qt_mt_XftInit = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qt_mt_XftInit" >&5
+$as_echo "$ac_cv_lib_qt_mt_XftInit" >&6; }
+if test "x$ac_cv_lib_qt_mt_XftInit" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBQT_MT 1
 _ACEOF
@@ -49252,15 +50533,15 @@
 
 
 
-   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+$as_echo_n "checking for fontconfig-config... " >&6; }
    if test -n "$FONTCONFIG_CONFIG"; then
         kde_cv_path="$FONTCONFIG_CONFIG";
    else
         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -49302,18 +50583,18 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-   { echo "$as_me:$LINENO: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for pkg-config" >&5
+$as_echo_n "checking for pkg-config... " >&6; }
    if test -n "$PKGCONFIG"; then
         kde_cv_path="$PKGCONFIG";
    else
         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -49355,22 +50636,22 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
-echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+      { $as_echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
+$as_echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       PKGCONFIG=$kde_cv_path
 
    fi
 
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       FONTCONFIG_CONFIG=$kde_cv_path
 
    fi
@@ -49395,15 +50676,15 @@
 fi
 
 
-   { echo "$as_me:$LINENO: checking for freetype-config" >&5
-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for freetype-config" >&5
+$as_echo_n "checking for freetype-config... " >&6; }
    if test -n "$KDEINIT_FREETYPE_CONFIG"; then
         kde_cv_path="$KDEINIT_FREETYPE_CONFIG";
    else
         kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -49445,12 +50726,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       KDEINIT_FREETYPE_CONFIG=$kde_cv_path
 
    fi
@@ -49473,17 +50754,17 @@
 
 
    if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+$as_echo_n "checking for X11/Xft/Xft.h... " >&6; }
 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+$as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
-echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
+$as_echo_n "checking X11/Xft/Xft.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -49499,32 +50780,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
-echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
+$as_echo_n "checking X11/Xft/Xft.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -49538,66 +50820,67 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+$as_echo_n "checking for X11/Xft/Xft.h... " >&6; }
 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+$as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; }
 
 fi
-if test $ac_cv_header_X11_Xft_Xft_h = yes; then
+if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then
   :
 else
   KDEINIT_USE_XFT=
@@ -49633,13 +50916,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether to make kdeinit setuid root in order to protect it from bad Linux OOM-killer" >&5
-echo $ECHO_N "checking whether to make kdeinit setuid root in order to protect it from bad Linux OOM-killer... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to make kdeinit setuid root in order to protect it from bad Linux OOM-killer" >&5
+$as_echo_n "checking whether to make kdeinit setuid root in order to protect it from bad Linux OOM-killer... " >&6; }
 kdeinit_setuid=
 case $target_os in
     linux*)
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         KDEINIT_SETUID=1
 
 cat >>confdefs.h <<\_ACEOF
@@ -49647,8 +50930,8 @@
 _ACEOF
 
         ;;
-    *)  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    *)  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         KDEINIT_SETUID=0
         ;;
 esac
@@ -49682,10 +50965,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
-echo $ECHO_N "checking for FAMOpen in -lfam... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
+$as_echo_n "checking for FAMOpen in -lfam... " >&6; }
 if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfam  $LIBS"
@@ -49717,33 +51000,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_fam_FAMOpen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_fam_FAMOpen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_fam_FAMOpen" >&6; }
-if test $ac_cv_lib_fam_FAMOpen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen" >&5
+$as_echo "$ac_cv_lib_fam_FAMOpen" >&6; }
+if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then
   LIBFAM="-lfam"; kde_have_fam=yes
 else
   kde_have_fam=no
@@ -49770,10 +51057,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for libz" >&5
-echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libz" >&5
+$as_echo_n "checking for libz... " >&6; }
 if test "${ac_cv_lib_z+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -49811,26 +51098,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "ac_cv_lib_z='-lz'"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_z=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -49844,15 +51135,15 @@
 _ACEOF
 
   LIBZ="$ac_cv_lib_z"
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+$as_echo "$ac_cv_lib_z" >&6; }
 else
-  { { echo "$as_me:$LINENO: error: not found.
+  { { $as_echo "$as_me:$LINENO: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
           Check your installation and look into config.log" >&5
-echo "$as_me: error: not found.
+$as_echo "$as_me: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
@@ -49871,20 +51162,21 @@
 
 for ac_header in sys/mnttab.h sys/mntent.h mntent.h fstab.h sys/ucred.h sys/mount.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -49900,32 +51192,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -49939,69 +51232,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -50012,11 +51309,11 @@
 
 for ac_func in setmntent getmntinfo
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -50069,35 +51366,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -50108,10 +51412,10 @@
 
 
 kde_have_volmgt=yes
-{ echo "$as_me:$LINENO: checking for volmgt_running in -lvolmgt" >&5
-echo $ECHO_N "checking for volmgt_running in -lvolmgt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for volmgt_running in -lvolmgt" >&5
+$as_echo_n "checking for volmgt_running in -lvolmgt... " >&6; }
 if test "${ac_cv_lib_volmgt_volmgt_running+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvolmgt  $LIBS"
@@ -50143,33 +51447,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_volmgt_volmgt_running=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_volmgt_volmgt_running=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_volmgt_volmgt_running" >&5
-echo "${ECHO_T}$ac_cv_lib_volmgt_volmgt_running" >&6; }
-if test $ac_cv_lib_volmgt_volmgt_running = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_volmgt_volmgt_running" >&5
+$as_echo "$ac_cv_lib_volmgt_volmgt_running" >&6; }
+if test "x$ac_cv_lib_volmgt_volmgt_running" = x""yes; then
   LIBVOLMGT=-lvolmgt
 else
   kde_have_volmgt=no
@@ -50191,10 +51499,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
-echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
+$as_echo_n "checking if you need GNU extensions... " >&6; }
 if test "${ac_cv_gnu_extensions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat > conftest.c << EOF
@@ -50216,8 +51524,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
-echo "${ECHO_T}$ac_cv_gnu_extensions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
+$as_echo "$ac_cv_gnu_extensions" >&6; }
 if test "$ac_cv_gnu_extensions" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -50228,10 +51536,10 @@
 
 
 if test "x$kde_enable_dnotify" = "xyes"; then
-  { echo "$as_me:$LINENO: checking for Linux Directory Notification" >&5
-echo $ECHO_N "checking for Linux Directory Notification... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for Linux Directory Notification" >&5
+$as_echo_n "checking for Linux Directory Notification... " >&6; }
   if test "${kde_cv_have_dnotify+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   kde_cv_have_dnotify=no
@@ -50277,20 +51585,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -50314,11 +51623,11 @@
 #define HAVE_DNOTIFY 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -50331,10 +51640,10 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
-echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
+$as_echo_n "checking if you need GNU extensions... " >&6; }
 if test "${ac_cv_gnu_extensions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat > conftest.c << EOF
@@ -50356,8 +51665,8 @@
 fi
 
 
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
-echo "${ECHO_T}$ac_cv_gnu_extensions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
+$as_echo "$ac_cv_gnu_extensions" >&6; }
 if test "$ac_cv_gnu_extensions" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -50368,10 +51677,10 @@
 
 
 if test "x$kde_enable_inotify" = "xyes"; then
-  { echo "$as_me:$LINENO: checking for Linux Inotify Notification" >&5
-echo $ECHO_N "checking for Linux Inotify Notification... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for Linux Inotify Notification" >&5
+$as_echo_n "checking for Linux Inotify Notification... " >&6; }
   if test "${kde_cv_have_inotify+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   kde_cv_have_inotify=no
@@ -50416,20 +51725,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_have_inotify=no
@@ -50453,11 +51763,11 @@
 #define HAVE_INOTIFY 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -50487,11 +51797,11 @@
 
 if test $want_ssl = yes; then
 
-{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for OpenSSL" >&5
+$as_echo_n "checking for OpenSSL... " >&6; }
 
 if test "${ac_cv_have_ssl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   #try to guess OpenSSL locations
 
@@ -50503,7 +51813,7 @@
 do
   for j in openssl/ssl.h;
   do
-    echo "configure: 50506: $i/$j" >&5
+    echo "configure: 51816: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ssl_incdir=$i
@@ -50555,28 +51865,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_ssl_rsaref="yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_ssl_rsaref="no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -50595,28 +51909,28 @@
 
   eval "$ac_cv_have_ssl"
 
-  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+$as_echo "libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
 
-  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
-echo "${ECHO_T}$ac_ssl_rsaref" >&6; }
-
-  { echo "$as_me:$LINENO: checking for easter eggs" >&5
-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: none found" >&5
-echo "${ECHO_T}none found" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+$as_echo_n "checking whether OpenSSL uses rsaref... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+$as_echo "$ac_ssl_rsaref" >&6; }
+
+  { $as_echo "$as_me:$LINENO: checking for easter eggs" >&5
+$as_echo_n "checking for easter eggs... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: none found" >&5
+$as_echo "none found" >&6; }
 
 else
   have_ssl=no
 fi
 
 if test "$have_ssl" = yes; then
-  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+$as_echo_n "checking for OpenSSL version... " >&6; }
     if test "${ac_cv_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -50645,37 +51959,37 @@
     if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 
       if eval `./conftest 2>&5`; then
         if test $ssl_version = error; then
-          { { echo "$as_me:$LINENO: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&5
-echo "$as_me: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&5
+$as_echo "$as_me: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&2;}
    { (exit 1); exit 1; }; }
         else
           if test $ssl_version = old; then
-            { echo "$as_me:$LINENO: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&5
-echo "$as_me: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&2;}
+            { $as_echo "$as_me:$LINENO: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&5
+$as_echo "$as_me: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&2;}
             have_ssl=no
           fi
         fi
         ac_cv_ssl_version="ssl_version=$ssl_version"
       else
-        { { echo "$as_me:$LINENO: error: Your system couldn't run a small SSL test program.
+        { { $as_echo "$as_me:$LINENO: error: Your system couldn't run a small SSL test program.
         Check config.log, and if you can't figure it out, send a mail to
         David Faure <faure@kde.org>, attaching your config.log" >&5
-echo "$as_me: error: Your system couldn't run a small SSL test program.
+$as_echo "$as_me: error: Your system couldn't run a small SSL test program.
         Check config.log, and if you can't figure it out, send a mail to
         David Faure <faure@kde.org>, attaching your config.log" >&2;}
    { (exit 1); exit 1; }; }
       fi
 
     else
-      { { echo "$as_me:$LINENO: error: Your system couldn't link a small SSL test program.
+      { { $as_echo "$as_me:$LINENO: error: Your system couldn't link a small SSL test program.
       Check config.log, and if you can't figure it out, send a mail to
       David Faure <faure@kde.org>, attaching your config.log" >&5
-echo "$as_me: error: Your system couldn't link a small SSL test program.
+$as_echo "$as_me: error: Your system couldn't link a small SSL test program.
       Check config.log, and if you can't figure it out, send a mail to
       David Faure <faure@kde.org>, attaching your config.log" >&2;}
    { (exit 1); exit 1; }; }
@@ -50687,8 +52001,8 @@
 
 
   eval "$ac_cv_ssl_version"
-  { echo "$as_me:$LINENO: result: $ssl_version" >&5
-echo "${ECHO_T}$ssl_version" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ssl_version" >&5
+$as_echo "$ssl_version" >&6; }
 fi
 
 if test "$have_ssl" != yes; then
@@ -50751,18 +52065,20 @@
 ac_config_headers="$ac_config_headers kio/kssl/ksslconfig.h"
 
 
-{ echo "$as_me:$LINENO: checking for setgroups with short argument" >&5
-echo $ECHO_N "checking for setgroups with short argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for setgroups with short argument" >&5
+$as_echo_n "checking for setgroups with short argument... " >&6; }
 if test "${kde_cv_shortsetgroups+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -50792,29 +52108,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   kde_cv_shortsetgroups="yes"
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 kde_cv_shortsetgroups="no"
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -50822,8 +52141,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: result: $kde_cv_shortsetgroups" >&5
-echo "${ECHO_T}$kde_cv_shortsetgroups" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $kde_cv_shortsetgroups" >&5
+$as_echo "$kde_cv_shortsetgroups" >&6; }
 if test "$kde_cv_shortsetgroups" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -50836,20 +52155,21 @@
 
 for ac_header in arpa/nameser8_compat.h sys/param.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -50865,32 +52185,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -50904,69 +52225,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -51009,11 +52334,11 @@
 
 for ac_func in setfsent
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -51066,35 +52391,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -51107,8 +52439,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking whether to enable GSSAPI support" >&5
-echo $ECHO_N "checking whether to enable GSSAPI support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable GSSAPI support" >&5
+$as_echo_n "checking whether to enable GSSAPI support... " >&6; }
 
 # Check whether --with-gssapi was given.
 if test "${with_gssapi+set}" = set; then
@@ -51125,15 +52457,15 @@
 if test "x$with_gssapi" = "xCHECK" ; then
   with_gssapi=NOTFOUND
 
-   { echo "$as_me:$LINENO: checking for krb5-config" >&5
-echo $ECHO_N "checking for krb5-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for krb5-config" >&5
+$as_echo_n "checking for krb5-config... " >&6; }
    if test -n "$KRB5_CONFIG"; then
         kde_cv_path="$KRB5_CONFIG";
    else
         kde_cache=`echo krb5-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -51175,15 +52507,15 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
 
-    { echo "$as_me:$LINENO: WARNING: Could not find krb5-config" >&5
-echo "$as_me: WARNING: Could not find krb5-config" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Could not find krb5-config" >&5
+$as_echo "$as_me: WARNING: Could not find krb5-config" >&2;}
 
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       KRB5_CONFIG=$kde_cv_path
 
    fi
@@ -51222,7 +52554,7 @@
 do
   for j in gssapi.h;
   do
-    echo "configure: 51225: $i/$j" >&5
+    echo "configure: 52557: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       gssapi_incdir=$i
@@ -51244,7 +52576,7 @@
 do
   for j in libgssapi.$ext;
   do
-    echo "configure: 51247: $i/$j" >&5
+    echo "configure: 52579: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       gssapi_libdir=$i
@@ -51269,8 +52601,8 @@
 fi
 
 case "$with_gssapi" in
-no) { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } ;;
+no) { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; } ;;
 framework)
   GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
 
@@ -51279,11 +52611,11 @@
 _ACEOF
 
   GSSAPI_SUBDIR="gssapi"
-  { echo "$as_me:$LINENO: result: Apple framework" >&5
-echo "${ECHO_T}Apple framework" >&6; }
+  { $as_echo "$as_me:$LINENO: result: Apple framework" >&5
+$as_echo "Apple framework" >&6; }
   ;;
-NOTFOUND) { echo "$as_me:$LINENO: result: searched but not found" >&5
-echo "${ECHO_T}searched but not found" >&6; } ;;
+NOTFOUND) { $as_echo "$as_me:$LINENO: result: searched but not found" >&5
+$as_echo "searched but not found" >&6; } ;;
 *)
   if test "x$with_gssapi" = "xFOUND" ; then
     msg="incs=$gssapi_incdir libs=$gssapi_libdir"
@@ -51317,8 +52649,8 @@
 #define HAVE_LIBGSSAPI 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $msg" >&5
+$as_echo "$msg" >&6; }
   ;;
 esac
 
@@ -51331,20 +52663,21 @@
 
 for ac_header in ieeefp.h float.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -51360,32 +52693,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -51399,79 +52733,83 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for finite in -lm" >&5
-echo $ECHO_N "checking for finite in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for finite in -lm" >&5
+$as_echo_n "checking for finite in -lm... " >&6; }
 if test "${ac_cv_lib_m_finite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -51503,33 +52841,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_finite=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_finite=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_finite" >&5
-echo "${ECHO_T}$ac_cv_lib_m_finite" >&6; }
-if test $ac_cv_lib_m_finite = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_finite" >&5
+$as_echo "$ac_cv_lib_m_finite" >&6; }
+if test "x$ac_cv_lib_m_finite" = x""yes; then
 
 
 cat >>confdefs.h <<_ACEOF
@@ -51539,10 +52881,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for _finite in -lm" >&5
-echo $ECHO_N "checking for _finite in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _finite in -lm" >&5
+$as_echo_n "checking for _finite in -lm... " >&6; }
 if test "${ac_cv_lib_m__finite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -51574,33 +52916,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m__finite=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m__finite=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m__finite" >&5
-echo "${ECHO_T}$ac_cv_lib_m__finite" >&6; }
-if test $ac_cv_lib_m__finite = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m__finite" >&5
+$as_echo "$ac_cv_lib_m__finite" >&6; }
+if test "x$ac_cv_lib_m__finite" = x""yes; then
 
 
 cat >>confdefs.h <<_ACEOF
@@ -51617,8 +52963,8 @@
 
     ac_save_libs="$LIBS"
     LIBS="-lm"
-    { echo "$as_me:$LINENO: checking for isnan with <math.h>" >&5
-echo $ECHO_N "checking for isnan with <math.h>... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for isnan with <math.h>" >&5
+$as_echo_n "checking for isnan with <math.h>... " >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -51641,34 +52987,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_ISNAN 1
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_libs"
@@ -51676,8 +53026,8 @@
 
     ac_save_libs="$LIBS"
     LIBS="-lm"
-    { echo "$as_me:$LINENO: checking for isinf with <math.h>" >&5
-echo $ECHO_N "checking for isinf with <math.h>... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for isinf with <math.h>" >&5
+$as_echo_n "checking for isinf with <math.h>... " >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -51700,34 +53050,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_ISINF 1
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_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; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_libs"
@@ -51746,15 +53100,15 @@
  if test "$with_pcre" = "yes"; then
 
 
-   { echo "$as_me:$LINENO: checking for pcre-config" >&5
-echo $ECHO_N "checking for pcre-config... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for pcre-config" >&5
+$as_echo_n "checking for pcre-config... " >&6; }
    if test -n "$PCRE_CONFIG"; then
         kde_cv_path="$PCRE_CONFIG";
    else
         kde_cache=`echo pcre-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         kde_cv_path="NONE"
@@ -51796,25 +53150,25 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
       PCRE_CONFIG=""
    else
-      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+$as_echo "$kde_cv_path" >&6; }
       PCRE_CONFIG=$kde_cv_path
 
    fi
 
     if test -n "$PCRE_CONFIG" && $PCRE_CONFIG --libs >/dev/null 2>&1; then
-        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,,"`
+        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,," -e "s,\b-.\+pcreposix^[:space:]*\b,,"`
         PCRECFLAGS=`$PCRE_CONFIG --cflags`
     else
-        LIBPCRE="-lpcre -lpcreposix"
+        LIBPCRE="-lpcre"
         PCRECFLAGS=
     fi
     if test "${ac_cv_have_pcreposix+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       ac_save_libs="$LIBS"
@@ -51844,27 +53198,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_have_pcreposix="yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_pcreposix="no"
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$ac_save_libs"
@@ -51880,12 +53238,12 @@
 _ACEOF
 
     else
-        { { echo "$as_me:$LINENO: error: You're missing libpcre.
+        { { $as_echo "$as_me:$LINENO: error: You're missing libpcre.
 Download libpcre from http://www.pcre.org or find a binary package for your platform.
 Alternatively, you can specify --disable-pcre, but some web pages - using regular
 expressions in Javascript code - will not work correctly, the regexp support being
 quite limited if libpcre isn't present." >&5
-echo "$as_me: error: You're missing libpcre.
+$as_echo "$as_me: error: You're missing libpcre.
 Download libpcre from http://www.pcre.org or find a binary package for your platform.
 Alternatively, you can specify --disable-pcre, but some web pages - using regular
 expressions in Javascript code - will not work correctly, the regexp support being
@@ -51926,10 +53284,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
+$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
 if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-laspell  $LIBS"
@@ -51961,33 +53319,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_aspell_new_aspell_config=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_aspell_new_aspell_config=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test $ac_cv_lib_aspell_new_aspell_config = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
+$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
+if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then
   LIBASPELL="-laspell"
 fi
 
@@ -52008,17 +53370,17 @@
 
 
    if test "${ac_cv_header_aspell_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for aspell.h" >&5
-echo $ECHO_N "checking for aspell.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for aspell.h" >&5
+$as_echo_n "checking for aspell.h... " >&6; }
 if test "${ac_cv_header_aspell_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_aspell_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
+$as_echo "$ac_cv_header_aspell_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking aspell.h usability" >&5
-echo $ECHO_N "checking aspell.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking aspell.h usability" >&5
+$as_echo_n "checking aspell.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52034,32 +53396,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking aspell.h presence" >&5
-echo $ECHO_N "checking aspell.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking aspell.h presence" >&5
+$as_echo_n "checking aspell.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52073,63 +53436,64 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: aspell.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: aspell.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: aspell.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: aspell.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: aspell.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: aspell.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: aspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: aspell.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: aspell.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: aspell.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: aspell.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: aspell.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: aspell.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: aspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: aspell.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: aspell.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: aspell.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for aspell.h" >&5
-echo $ECHO_N "checking for aspell.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for aspell.h" >&5
+$as_echo_n "checking for aspell.h... " >&6; }
 if test "${ac_cv_header_aspell_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_aspell_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_aspell_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_h" >&5
+$as_echo "$ac_cv_header_aspell_h" >&6; }
 
 fi
 
@@ -52202,10 +53566,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { echo "$as_me:$LINENO: checking for hspell_check_word in -lhspell" >&5
-echo $ECHO_N "checking for hspell_check_word in -lhspell... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for hspell_check_word in -lhspell" >&5
+$as_echo_n "checking for hspell_check_word in -lhspell... " >&6; }
 if test "${ac_cv_lib_hspell_hspell_check_word+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhspell -lz $LIBS"
@@ -52237,33 +53601,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hspell_hspell_check_word=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_hspell_hspell_check_word=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_hspell_hspell_check_word" >&5
-echo "${ECHO_T}$ac_cv_lib_hspell_hspell_check_word" >&6; }
-if test $ac_cv_lib_hspell_hspell_check_word = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hspell_hspell_check_word" >&5
+$as_echo "$ac_cv_lib_hspell_hspell_check_word" >&6; }
+if test "x$ac_cv_lib_hspell_hspell_check_word" = x""yes; then
   LIBHSPELL="-lhspell"
 fi
 
@@ -52284,17 +53652,17 @@
 
 
    if test "${ac_cv_header_hspell_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for hspell.h" >&5
-echo $ECHO_N "checking for hspell.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for hspell.h" >&5
+$as_echo_n "checking for hspell.h... " >&6; }
 if test "${ac_cv_header_hspell_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_hspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_hspell_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hspell_h" >&5
+$as_echo "$ac_cv_header_hspell_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking hspell.h usability" >&5
-echo $ECHO_N "checking hspell.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking hspell.h usability" >&5
+$as_echo_n "checking hspell.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52310,32 +53678,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking hspell.h presence" >&5
-echo $ECHO_N "checking hspell.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking hspell.h presence" >&5
+$as_echo_n "checking hspell.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52349,63 +53718,64 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: hspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: hspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: hspell.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: hspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: hspell.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: hspell.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: hspell.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: hspell.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: hspell.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: hspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: hspell.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: hspell.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: hspell.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: hspell.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: hspell.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: hspell.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: hspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: hspell.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hspell.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: hspell.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for hspell.h" >&5
-echo $ECHO_N "checking for hspell.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for hspell.h" >&5
+$as_echo_n "checking for hspell.h... " >&6; }
 if test "${ac_cv_header_hspell_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_hspell_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_hspell_h" >&5
-echo "${ECHO_T}$ac_cv_header_hspell_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hspell_h" >&5
+$as_echo "$ac_cv_header_hspell_h" >&6; }
 
 fi
 
@@ -52485,20 +53855,21 @@
 
 for ac_header in sys/soundcard.h machine/soundcard.h linux/awe_voice.h awe_voice.h /usr/src/sys/i386/isa/sound/awe_voice.h /usr/src/sys/gnu/i386/isa/sound/awe_voice.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52514,32 +53885,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52553,69 +53925,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -52643,20 +54019,21 @@
 
 for ac_header in  sys/asoundlib.h alsa/asoundlib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52672,32 +54049,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -52711,69 +54089,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
     kde_has_asoundlib=yes
@@ -52826,20 +54208,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_has_alsa_0_9=no
@@ -52884,20 +54267,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_has_alsa_0_5=no
@@ -52913,10 +54297,10 @@
 
 
   if test "x$kde_has_asoundlib" = "xyes"; then
-    { echo "$as_me:$LINENO: checking for snd_seq_create_simple_port in -lasound" >&5
-echo $ECHO_N "checking for snd_seq_create_simple_port in -lasound... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for snd_seq_create_simple_port in -lasound" >&5
+$as_echo_n "checking for snd_seq_create_simple_port in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -52948,33 +54332,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $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
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_seq_create_simple_port=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_create_simple_port" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_seq_create_simple_port" >&6; }
-if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_create_simple_port" >&5
+$as_echo "$ac_cv_lib_asound_snd_seq_create_simple_port" >&6; }
+if test "x$ac_cv_lib_asound_snd_seq_create_simple_port" = x""yes; then
 
       if test "x$kde_has_alsa_0_5" = "xyes"; then
         LIBASOUND="-lasound"
@@ -52991,10 +54379,10 @@
 #define HAVE_LIBASOUND2 1
 _ACEOF
 
-        { echo "$as_me:$LINENO: checking for snd_pcm_resume in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_resume in -lasound... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for snd_pcm_resume in -lasound" >&5
+$as_echo_n "checking for snd_pcm_resume in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_resume+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -53026,33 +54414,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_resume=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_resume=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_resume" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_resume" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_resume = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_resume" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_resume" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_resume" = x""yes; then
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -53106,8 +54498,8 @@
 fi
 
 for i in $ac_topsubdirs; do
-  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+$as_echo_n "checking if $i should be compiled... " >&6; }
   if test -d $srcdir/$i; then
     install_it="yes"
     for j in $DO_NOT_COMPILE; do
@@ -53118,8 +54510,8 @@
   else
     install_it="no"
   fi
-  { echo "$as_me:$LINENO: result: $install_it" >&5
-echo "${ECHO_T}$install_it" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $install_it" >&5
+$as_echo "$install_it" >&6; }
   vari=`echo $i | sed -e 's,[-+.@],_,g'`
   if test $install_it = "yes"; then
     TOPSUBDIRS="$TOPSUBDIRS $i"
@@ -53211,6 +54603,22 @@
   kio_SUBDIR_included_FALSE=
 fi
 
+ if test "x$kded_SUBDIR_included" = xyes; then
+  kded_SUBDIR_included_TRUE=
+  kded_SUBDIR_included_FALSE='#'
+else
+  kded_SUBDIR_included_TRUE='#'
+  kded_SUBDIR_included_FALSE=
+fi
+
+ if test "x$kded_post_SUBDIR_included" = xyes; then
+  kded_post_SUBDIR_included_TRUE=
+  kded_post_SUBDIR_included_FALSE='#'
+else
+  kded_post_SUBDIR_included_TRUE='#'
+  kded_post_SUBDIR_included_FALSE=
+fi
+
  if test "x$arts_SUBDIR_included" = xyes; then
   arts_SUBDIR_included_TRUE=
   arts_SUBDIR_included_FALSE='#'
@@ -53243,14 +54651,6 @@
   kconf_update_SUBDIR_included_FALSE=
 fi
 
- if test "x$kded_SUBDIR_included" = xyes; then
-  kded_SUBDIR_included_TRUE=
-  kded_SUBDIR_included_FALSE='#'
-else
-  kded_SUBDIR_included_TRUE='#'
-  kded_SUBDIR_included_FALSE=
-fi
-
  if test "x$kdoctools_SUBDIR_included" = xyes; then
   kdoctools_SUBDIR_included_TRUE=
   kdoctools_SUBDIR_included_FALSE='#'
@@ -53595,6 +54995,8 @@
 
 ac_config_files="$ac_config_files kded/test/Makefile"
 
+ac_config_files="$ac_config_files kded_post/Makefile"
+
 ac_config_files="$ac_config_files kdefx/Makefile"
 
 ac_config_files="$ac_config_files kdeprint/Makefile"
@@ -53895,11 +55297,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -53932,12 +55335,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -53953,7 +55356,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -53964,440 +55367,449 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_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.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
+$as_echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
+$as_echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+$as_echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_x11\" was never defined.
+$as_echo "$as_me: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_ARTS\" was never defined.
+$as_echo "$as_me: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+
 if test -z "${include_VERSION_SCRIPT_TRUE}" && test -z "${include_VERSION_SCRIPT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_VERSION_SCRIPT\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_VERSION_SCRIPT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_VERSION_SCRIPT\" was never defined.
-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.
+$as_echo "$as_me: error: conditional \"include_VERSION_SCRIPT\" 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.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_SVGICONS\" was never defined.
+$as_echo "$as_me: error: conditional \"include_SVGICONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_cups_SUBDIR_TRUE}" && test -z "${include_cups_SUBDIR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_cups_SUBDIR\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_cups_SUBDIR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_cups_SUBDIR\" was never defined.
+$as_echo "$as_me: error: conditional \"include_cups_SUBDIR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_BZIP2_TRUE}" && test -z "${include_BZIP2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_BZIP2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_BZIP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_BZIP2\" was never defined.
+$as_echo "$as_me: error: conditional \"include_BZIP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${DOJAVA_TRUE}" && test -z "${DOJAVA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"DOJAVA\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"DOJAVA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"DOJAVA\" was never defined.
+$as_echo "$as_me: error: conditional \"DOJAVA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_TIFF_MODULES_TRUE}" && test -z "${include_TIFF_MODULES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_TIFF_MODULES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_TIFF_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_TIFF_MODULES\" was never defined.
+$as_echo "$as_me: error: conditional \"include_TIFF_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_JP2_MODULES_TRUE}" && test -z "${include_JP2_MODULES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_JP2_MODULES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_JP2_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_JP2_MODULES\" was never defined.
+$as_echo "$as_me: error: conditional \"include_JP2_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_EXR_MODULES_TRUE}" && test -z "${include_EXR_MODULES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_EXR_MODULES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_EXR_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_EXR_MODULES\" was never defined.
+$as_echo "$as_me: error: conditional \"include_EXR_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_bzip2_TRUE}" && test -z "${include_bzip2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_bzip2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_bzip2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_bzip2\" was never defined.
+$as_echo "$as_me: error: conditional \"include_bzip2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_aspell_plugin_TRUE}" && test -z "${include_aspell_plugin_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_aspell_plugin\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_aspell_plugin\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_aspell_plugin\" was never defined.
+$as_echo "$as_me: error: conditional \"include_aspell_plugin\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_hspell_plugin_TRUE}" && test -z "${include_hspell_plugin_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_hspell_plugin\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_hspell_plugin\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_hspell_plugin\" was never defined.
+$as_echo "$as_me: error: conditional \"include_hspell_plugin\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${undefined_symbols_allowed_TRUE}" && test -z "${undefined_symbols_allowed_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"undefined_symbols_allowed\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"undefined_symbols_allowed\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"undefined_symbols_allowed\" was never defined.
+$as_echo "$as_me: error: conditional \"undefined_symbols_allowed\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${dcop_SUBDIR_included_TRUE}" && test -z "${dcop_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"dcop_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"dcop_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"dcop_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"dcop_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${libltdl_SUBDIR_included_TRUE}" && test -z "${libltdl_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"libltdl_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"libltdl_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"libltdl_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"libltdl_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdefx_SUBDIR_included_TRUE}" && test -z "${kdefx_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdefx_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdefx_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdefx_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdefx_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdecore_SUBDIR_included_TRUE}" && test -z "${kdecore_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdecore_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdecore_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdecore_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdecore_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kunittest_SUBDIR_included_TRUE}" && test -z "${kunittest_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kunittest_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kunittest_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kunittest_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kunittest_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdeui_SUBDIR_included_TRUE}" && test -z "${kdeui_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdeui_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdeui_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdeui_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdeui_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdesu_SUBDIR_included_TRUE}" && test -z "${kdesu_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdesu_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdesu_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdesu_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdesu_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kjs_SUBDIR_included_TRUE}" && test -z "${kjs_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kjs_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kjs_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kjs_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kjs_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kwallet_SUBDIR_included_TRUE}" && test -z "${kwallet_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kwallet_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kwallet_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kwallet_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kwallet_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kio_SUBDIR_included_TRUE}" && test -z "${kio_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kio_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kio_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kio_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kio_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${arts_SUBDIR_included_TRUE}" && test -z "${arts_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"arts_SUBDIR_included\" was never defined.
+if test -z "${kded_SUBDIR_included_TRUE}" && test -z "${kded_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kded_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"arts_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kded_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${dnssd_SUBDIR_included_TRUE}" && test -z "${dnssd_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"dnssd_SUBDIR_included\" was never defined.
+if test -z "${kded_post_SUBDIR_included_TRUE}" && test -z "${kded_post_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kded_post_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"dnssd_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kded_post_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${kab_SUBDIR_included_TRUE}" && test -z "${kab_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kab_SUBDIR_included\" was never defined.
+if test -z "${arts_SUBDIR_included_TRUE}" && test -z "${arts_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"arts_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kab_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"arts_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${kconf_update_SUBDIR_included_TRUE}" && test -z "${kconf_update_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kconf_update_SUBDIR_included\" was never defined.
+if test -z "${dnssd_SUBDIR_included_TRUE}" && test -z "${dnssd_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"dnssd_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kconf_update_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"dnssd_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${kded_SUBDIR_included_TRUE}" && test -z "${kded_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kded_SUBDIR_included\" was never defined.
+if test -z "${kab_SUBDIR_included_TRUE}" && test -z "${kab_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kab_SUBDIR_included\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"kab_SUBDIR_included\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${kconf_update_SUBDIR_included_TRUE}" && test -z "${kconf_update_SUBDIR_included_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kconf_update_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kded_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kconf_update_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdoctools_SUBDIR_included_TRUE}" && test -z "${kdoctools_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdoctools_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdoctools_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdoctools_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdoctools_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kimgio_SUBDIR_included_TRUE}" && test -z "${kimgio_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kimgio_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kimgio_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kimgio_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kimgio_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kioslave_SUBDIR_included_TRUE}" && test -z "${kioslave_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kioslave_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kioslave_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kioslave_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kioslave_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${knewstuff_SUBDIR_included_TRUE}" && test -z "${knewstuff_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"knewstuff_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"knewstuff_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"knewstuff_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"knewstuff_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kparts_SUBDIR_included_TRUE}" && test -z "${kparts_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kparts_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kparts_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kparts_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kparts_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kresources_SUBDIR_included_TRUE}" && test -z "${kresources_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kresources_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kresources_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kresources_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kresources_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kstyles_SUBDIR_included_TRUE}" && test -z "${kstyles_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kstyles_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kstyles_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kstyles_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kstyles_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kutils_SUBDIR_included_TRUE}" && test -z "${kutils_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kutils_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kutils_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kutils_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kutils_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${libkmid_SUBDIR_included_TRUE}" && test -z "${libkmid_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"libkmid_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"libkmid_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"libkmid_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"libkmid_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${libkscreensaver_SUBDIR_included_TRUE}" && test -z "${libkscreensaver_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"libkscreensaver_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"libkscreensaver_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"libkscreensaver_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"libkscreensaver_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${licenses_SUBDIR_included_TRUE}" && test -z "${licenses_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"licenses_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"licenses_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"licenses_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"licenses_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${mimetypes_SUBDIR_included_TRUE}" && test -z "${mimetypes_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"mimetypes_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"mimetypes_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"mimetypes_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"mimetypes_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${pics_SUBDIR_included_TRUE}" && test -z "${pics_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"pics_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"pics_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"pics_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"pics_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${doc_SUBDIR_included_TRUE}" && test -z "${doc_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kcert_SUBDIR_included_TRUE}" && test -z "${kcert_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kcert_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kcert_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kcert_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kcert_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kinit_SUBDIR_included_TRUE}" && test -z "${kinit_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kinit_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kinit_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kinit_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kinit_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdeprint_SUBDIR_included_TRUE}" && test -z "${kdeprint_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kabc_SUBDIR_included_TRUE}" && test -z "${kabc_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kabc_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kabc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kabc_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kabc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kspell2_SUBDIR_included_TRUE}" && test -z "${kspell2_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kspell2_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kspell2_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kspell2_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kspell2_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kmdi_SUBDIR_included_TRUE}" && test -z "${kmdi_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kmdi_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kmdi_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kmdi_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kmdi_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kcmshell_SUBDIR_included_TRUE}" && test -z "${kcmshell_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kcmshell_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kcmshell_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kcmshell_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kcmshell_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${khtml_SUBDIR_included_TRUE}" && test -z "${khtml_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"khtml_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"khtml_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"khtml_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"khtml_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${interfaces_SUBDIR_included_TRUE}" && test -z "${interfaces_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"interfaces_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"interfaces_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"interfaces_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"interfaces_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kdewidgets_SUBDIR_included_TRUE}" && test -z "${kdewidgets_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kdewidgets_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kdewidgets_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kdewidgets_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kdewidgets_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${kate_SUBDIR_included_TRUE}" && test -z "${kate_SUBDIR_included_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"kate_SUBDIR_included\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"kate_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"kate_SUBDIR_included\" was never defined.
+$as_echo "$as_me: error: conditional \"kate_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -54410,7 +55822,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -54420,7 +55832,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -54442,17 +55854,45 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -54468,8 +55908,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -54492,7 +55930,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -54505,17 +55943,10 @@
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -54537,7 +55968,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -54588,7 +56019,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -54616,7 +56047,6 @@
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -54629,19 +56059,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -54666,10 +56099,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -54692,7 +56125,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -54705,7 +56138,16 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -54713,22 +56155,23 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -54742,13 +56185,13 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -54756,11 +56199,12 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -54782,30 +56226,36 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -54824,27 +56274,29 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -54852,7 +56304,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -54936,6 +56388,7 @@
     "kdecore/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kdecore/tests/Makefile" ;;
     "kded/Makefile") CONFIG_FILES="$CONFIG_FILES kded/Makefile" ;;
     "kded/test/Makefile") CONFIG_FILES="$CONFIG_FILES kded/test/Makefile" ;;
+    "kded_post/Makefile") CONFIG_FILES="$CONFIG_FILES kded_post/Makefile" ;;
     "kdefx/Makefile") CONFIG_FILES="$CONFIG_FILES kdefx/Makefile" ;;
     "kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;;
     "kdeprint/cups/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/cups/Makefile" ;;
@@ -55071,8 +56524,8 @@
     "kdoctools/checkXML") CONFIG_FILES="$CONFIG_FILES kdoctools/checkXML" ;;
     "khtml/java/kjava.policy") CONFIG_FILES="$CONFIG_FILES khtml/java/kjava.policy" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -55113,646 +56566,144 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-kde_libs_prefix!$kde_libs_prefix$ac_delim
-kde_libs_htmldir!$kde_libs_htmldir$ac_delim
-CONF_FILES!$CONF_FILES$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
-HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
-unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
-unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
-USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
-USE_RTTI!$USE_RTTI$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
-NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
-ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
-LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
-LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
-KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
-KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
-KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
-KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
-KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
-KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
-KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-KDE_PLUGIN!$KDE_PLUGIN$ac_delim
-KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
-INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
-INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
-CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
-CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
-LIBADD_DL!$LIBADD_DL$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-ACL_LIBS!$ACL_LIBS$ac_delim
-LIBUTIL!$LIBUTIL$ac_delim
-LIBCOMPAT!$LIBCOMPAT$ac_delim
-LIBCRYPT!$LIBCRYPT$ac_delim
-LIBRESOLV!$LIBRESOLV$ac_delim
-LIB_POLL!$LIB_POLL$ac_delim
-FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
-LIBSOCKET!$LIBSOCKET$ac_delim
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-LIBUCB!$LIBUCB$ac_delim
-LIBDL!$LIBDL$ac_delim
-KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
-KDE_USE_PIE!$KDE_USE_PIE$ac_delim
-include_x11_TRUE!$include_x11_TRUE$ac_delim
-include_x11_FALSE!$include_x11_FALSE$ac_delim
-XMKMF!$XMKMF$ac_delim
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-LIB_X11!$LIB_X11$ac_delim
-LIB_XRENDER!$LIB_XRENDER$ac_delim
-LIBSM!$LIBSM$ac_delim
-X_INCLUDES!$X_INCLUDES$ac_delim
-X_LDFLAGS!$X_LDFLAGS$ac_delim
-x_includes!$x_includes$ac_delim
-x_libraries!$x_libraries$ac_delim
-QTE_NORTTI!$QTE_NORTTI$ac_delim
-LIB_XEXT!$LIB_XEXT$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-LIBPTHREAD!$LIBPTHREAD$ac_delim
-USE_THREADS!$USE_THREADS$ac_delim
-KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
-KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
-USER_INCLUDES!$USER_INCLUDES$ac_delim
-USER_LDFLAGS!$USER_LDFLAGS$ac_delim
-LIBZ!$LIBZ$ac_delim
-LIBPNG!$LIBPNG$ac_delim
-LIBJPEG!$LIBJPEG$ac_delim
-qt_libraries!$qt_libraries$ac_delim
-qt_includes!$qt_includes$ac_delim
-QT_INCLUDES!$QT_INCLUDES$ac_delim
-QT_LDFLAGS!$QT_LDFLAGS$ac_delim
-PERL!$PERL$ac_delim
-MOC!$MOC$ac_delim
-UIC!$UIC$ac_delim
-UIC_TR!$UIC_TR$ac_delim
-LIB_QT!$LIB_QT$ac_delim
-LIB_QPE!$LIB_QPE$ac_delim
-kde_qtver!$kde_qtver$ac_delim
-KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
-KDE_RPATH!$KDE_RPATH$ac_delim
-X_RPATH!$X_RPATH$ac_delim
-kde_libraries!$kde_libraries$ac_delim
-kde_includes!$kde_includes$ac_delim
-KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
-KDE_INCLUDES!$KDE_INCLUDES$ac_delim
-all_includes!$all_includes$ac_delim
-all_libraries!$all_libraries$ac_delim
-AUTODIRS!$AUTODIRS$ac_delim
-_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-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
-DCOPIDLNG!$DCOPIDLNG$ac_delim
-DCOPIDL!$DCOPIDL$ac_delim
-DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
-DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
-MCOPIDL!$MCOPIDL$ac_delim
-ARTSCCONFIG!$ARTSCCONFIG$ac_delim
-MEINPROC!$MEINPROC$ac_delim
-KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
-XMLLINT!$XMLLINT$ac_delim
-kde_htmldir!$kde_htmldir$ac_delim
-kde_appsdir!$kde_appsdir$ac_delim
-kde_icondir!$kde_icondir$ac_delim
-kde_sounddir!$kde_sounddir$ac_delim
-kde_datadir!$kde_datadir$ac_delim
-kde_locale!$kde_locale$ac_delim
-kde_confdir!$kde_confdir$ac_delim
-kde_kcfgdir!$kde_kcfgdir$ac_delim
-kde_mimedir!$kde_mimedir$ac_delim
-kde_wallpaperdir!$kde_wallpaperdir$ac_delim
-kde_bindir!$kde_bindir$ac_delim
-xdg_appsdir!$xdg_appsdir$ac_delim
-xdg_menudir!$xdg_menudir$ac_delim
-xdg_directorydir!$xdg_directorydir$ac_delim
-kde_templatesdir!$kde_templatesdir$ac_delim
-kde_servicesdir!$kde_servicesdir$ac_delim
-kde_servicetypesdir!$kde_servicetypesdir$ac_delim
-kde_moduledir!$kde_moduledir$ac_delim
-kdeinitdir!$kdeinitdir$ac_delim
-kde_styledir!$kde_styledir$ac_delim
-kde_widgetdir!$kde_widgetdir$ac_delim
-LIB_KDED!$LIB_KDED$ac_delim
-LIB_KDECORE!$LIB_KDECORE$ac_delim
-LIB_KDEUI!$LIB_KDEUI$ac_delim
-LIB_KIO!$LIB_KIO$ac_delim
-LIB_KJS!$LIB_KJS$ac_delim
-LIB_SMB!$LIB_SMB$ac_delim
-LIB_KAB!$LIB_KAB$ac_delim
-LIB_KABC!$LIB_KABC$ac_delim
-LIB_KHTML!$LIB_KHTML$ac_delim
-LIB_KSPELL!$LIB_KSPELL$ac_delim
-LIB_KPARTS!$LIB_KPARTS$ac_delim
-LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
-LIB_KUTILS!$LIB_KUTILS$ac_delim
-LIB_KDEPIM!$LIB_KDEPIM$ac_delim
-LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
-LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
-LIB_KDNSSD!$LIB_KDNSSD$ac_delim
-LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
-LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
-LIB_KFILE!$LIB_KFILE$ac_delim
-LIB_KFM!$LIB_KFM$ac_delim
-QNAMESPACE_H!$QNAMESPACE_H$ac_delim
-LIBICE!$LIBICE$ac_delim
-LIB_KIMGIO!$LIB_KIMGIO$ac_delim
-EXTRA_SUBDIRS!$EXTRA_SUBDIRS$ac_delim
-HAVE_SENDFILE!$HAVE_SENDFILE$ac_delim
-HAVE_MITSHM!$HAVE_MITSHM$ac_delim
-ICE_SUBDIR!$ICE_SUBDIR$ac_delim
-ICE_RLIB!$ICE_RLIB$ac_delim
-LIBUTEMPTER!$LIBUTEMPTER$ac_delim
-QTDOCDIR!$QTDOCDIR$ac_delim
-KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
-DOXYGEN!$DOXYGEN$ac_delim
-DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
-DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
-KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
-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
-LUA!$LUA$ac_delim
-LUA_INCLUDES!$LUA_INCLUDES$ac_delim
-LUA_LIBS!$LUA_LIBS$ac_delim
-LIB_IDN!$LIB_IDN$ac_delim
-LIBART_LIBS!$LIBART_LIBS$ac_delim
-LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim
-LIBART_RPATH!$LIBART_RPATH$ac_delim
-include_SVGICONS_TRUE!$include_SVGICONS_TRUE$ac_delim
-include_SVGICONS_FALSE!$include_SVGICONS_FALSE$ac_delim
-KDE_FORCE_INLINE!$KDE_FORCE_INLINE$ac_delim
-kde_cups_config!$kde_cups_config$ac_delim
-include_cups_SUBDIR_TRUE!$include_cups_SUBDIR_TRUE$ac_delim
-include_cups_SUBDIR_FALSE!$include_cups_SUBDIR_FALSE$ac_delim
-LIB_CUPS!$LIB_CUPS$ac_delim
-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
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
 
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
-LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
-LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
-LIBXML_LIBS!$LIBXML_LIBS$ac_delim
-LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
-LIBXML_RPATH!$LIBXML_RPATH$ac_delim
-HELP_SUBDIR!$HELP_SUBDIR$ac_delim
-MEINPROC_DEP!$MEINPROC_DEP$ac_delim
-DOJAVA_TRUE!$DOJAVA_TRUE$ac_delim
-DOJAVA_FALSE!$DOJAVA_FALSE$ac_delim
-LIBTHAI!$LIBTHAI$ac_delim
-KJAVA_POLICYPATH!$KJAVA_POLICYPATH$ac_delim
-LIBTIFF!$LIBTIFF$ac_delim
-LIB_JASPER!$LIB_JASPER$ac_delim
-LIB_EXR!$LIB_EXR$ac_delim
-EXR_FLAGS!$EXR_FLAGS$ac_delim
-include_TIFF_MODULES_TRUE!$include_TIFF_MODULES_TRUE$ac_delim
-include_TIFF_MODULES_FALSE!$include_TIFF_MODULES_FALSE$ac_delim
-include_JP2_MODULES_TRUE!$include_JP2_MODULES_TRUE$ac_delim
-include_JP2_MODULES_FALSE!$include_JP2_MODULES_FALSE$ac_delim
-include_EXR_MODULES_TRUE!$include_EXR_MODULES_TRUE$ac_delim
-include_EXR_MODULES_FALSE!$include_EXR_MODULES_FALSE$ac_delim
-KDEINIT_XFT_INCLUDES!$KDEINIT_XFT_INCLUDES$ac_delim
-KDEINIT_SETUID!$KDEINIT_SETUID$ac_delim
-LIBFAM!$LIBFAM$ac_delim
-LIBVOLMGT!$LIBVOLMGT$ac_delim
-SSL_INCLUDES!$SSL_INCLUDES$ac_delim
-SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
-LIBSSL!$LIBSSL$ac_delim
-include_bzip2_TRUE!$include_bzip2_TRUE$ac_delim
-include_bzip2_FALSE!$include_bzip2_FALSE$ac_delim
-GSSAPI_INCS!$GSSAPI_INCS$ac_delim
-GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim
-GSSAPI_RPATH!$GSSAPI_RPATH$ac_delim
-LIBPCRE!$LIBPCRE$ac_delim
-PCRECFLAGS!$PCRECFLAGS$ac_delim
-include_aspell_plugin_TRUE!$include_aspell_plugin_TRUE$ac_delim
-include_aspell_plugin_FALSE!$include_aspell_plugin_FALSE$ac_delim
-include_hspell_plugin_TRUE!$include_hspell_plugin_TRUE$ac_delim
-include_hspell_plugin_FALSE!$include_hspell_plugin_FALSE$ac_delim
-LIBASOUND!$LIBASOUND$ac_delim
-undefined_symbols_allowed_TRUE!$undefined_symbols_allowed_TRUE$ac_delim
-undefined_symbols_allowed_FALSE!$undefined_symbols_allowed_FALSE$ac_delim
-TOPSUBDIRS!$TOPSUBDIRS$ac_delim
-dcop_SUBDIR_included_TRUE!$dcop_SUBDIR_included_TRUE$ac_delim
-dcop_SUBDIR_included_FALSE!$dcop_SUBDIR_included_FALSE$ac_delim
-libltdl_SUBDIR_included_TRUE!$libltdl_SUBDIR_included_TRUE$ac_delim
-libltdl_SUBDIR_included_FALSE!$libltdl_SUBDIR_included_FALSE$ac_delim
-kdefx_SUBDIR_included_TRUE!$kdefx_SUBDIR_included_TRUE$ac_delim
-kdefx_SUBDIR_included_FALSE!$kdefx_SUBDIR_included_FALSE$ac_delim
-kdecore_SUBDIR_included_TRUE!$kdecore_SUBDIR_included_TRUE$ac_delim
-kdecore_SUBDIR_included_FALSE!$kdecore_SUBDIR_included_FALSE$ac_delim
-kunittest_SUBDIR_included_TRUE!$kunittest_SUBDIR_included_TRUE$ac_delim
-kunittest_SUBDIR_included_FALSE!$kunittest_SUBDIR_included_FALSE$ac_delim
-kdeui_SUBDIR_included_TRUE!$kdeui_SUBDIR_included_TRUE$ac_delim
-kdeui_SUBDIR_included_FALSE!$kdeui_SUBDIR_included_FALSE$ac_delim
-kdesu_SUBDIR_included_TRUE!$kdesu_SUBDIR_included_TRUE$ac_delim
-kdesu_SUBDIR_included_FALSE!$kdesu_SUBDIR_included_FALSE$ac_delim
-kjs_SUBDIR_included_TRUE!$kjs_SUBDIR_included_TRUE$ac_delim
-kjs_SUBDIR_included_FALSE!$kjs_SUBDIR_included_FALSE$ac_delim
-kwallet_SUBDIR_included_TRUE!$kwallet_SUBDIR_included_TRUE$ac_delim
-kwallet_SUBDIR_included_FALSE!$kwallet_SUBDIR_included_FALSE$ac_delim
-kio_SUBDIR_included_TRUE!$kio_SUBDIR_included_TRUE$ac_delim
-kio_SUBDIR_included_FALSE!$kio_SUBDIR_included_FALSE$ac_delim
-arts_SUBDIR_included_TRUE!$arts_SUBDIR_included_TRUE$ac_delim
-arts_SUBDIR_included_FALSE!$arts_SUBDIR_included_FALSE$ac_delim
-dnssd_SUBDIR_included_TRUE!$dnssd_SUBDIR_included_TRUE$ac_delim
-dnssd_SUBDIR_included_FALSE!$dnssd_SUBDIR_included_FALSE$ac_delim
-kab_SUBDIR_included_TRUE!$kab_SUBDIR_included_TRUE$ac_delim
-kab_SUBDIR_included_FALSE!$kab_SUBDIR_included_FALSE$ac_delim
-kconf_update_SUBDIR_included_TRUE!$kconf_update_SUBDIR_included_TRUE$ac_delim
-kconf_update_SUBDIR_included_FALSE!$kconf_update_SUBDIR_included_FALSE$ac_delim
-kded_SUBDIR_included_TRUE!$kded_SUBDIR_included_TRUE$ac_delim
-kded_SUBDIR_included_FALSE!$kded_SUBDIR_included_FALSE$ac_delim
-kdoctools_SUBDIR_included_TRUE!$kdoctools_SUBDIR_included_TRUE$ac_delim
-kdoctools_SUBDIR_included_FALSE!$kdoctools_SUBDIR_included_FALSE$ac_delim
-kimgio_SUBDIR_included_TRUE!$kimgio_SUBDIR_included_TRUE$ac_delim
-kimgio_SUBDIR_included_FALSE!$kimgio_SUBDIR_included_FALSE$ac_delim
-kioslave_SUBDIR_included_TRUE!$kioslave_SUBDIR_included_TRUE$ac_delim
-kioslave_SUBDIR_included_FALSE!$kioslave_SUBDIR_included_FALSE$ac_delim
-knewstuff_SUBDIR_included_TRUE!$knewstuff_SUBDIR_included_TRUE$ac_delim
-knewstuff_SUBDIR_included_FALSE!$knewstuff_SUBDIR_included_FALSE$ac_delim
-kparts_SUBDIR_included_TRUE!$kparts_SUBDIR_included_TRUE$ac_delim
-kparts_SUBDIR_included_FALSE!$kparts_SUBDIR_included_FALSE$ac_delim
-kresources_SUBDIR_included_TRUE!$kresources_SUBDIR_included_TRUE$ac_delim
-kresources_SUBDIR_included_FALSE!$kresources_SUBDIR_included_FALSE$ac_delim
-kstyles_SUBDIR_included_TRUE!$kstyles_SUBDIR_included_TRUE$ac_delim
-kstyles_SUBDIR_included_FALSE!$kstyles_SUBDIR_included_FALSE$ac_delim
-kutils_SUBDIR_included_TRUE!$kutils_SUBDIR_included_TRUE$ac_delim
-kutils_SUBDIR_included_FALSE!$kutils_SUBDIR_included_FALSE$ac_delim
-libkmid_SUBDIR_included_TRUE!$libkmid_SUBDIR_included_TRUE$ac_delim
-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
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-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
-doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
-kcert_SUBDIR_included_TRUE!$kcert_SUBDIR_included_TRUE$ac_delim
-kcert_SUBDIR_included_FALSE!$kcert_SUBDIR_included_FALSE$ac_delim
-kinit_SUBDIR_included_TRUE!$kinit_SUBDIR_included_TRUE$ac_delim
-kinit_SUBDIR_included_FALSE!$kinit_SUBDIR_included_FALSE$ac_delim
-kdeprint_SUBDIR_included_TRUE!$kdeprint_SUBDIR_included_TRUE$ac_delim
-kdeprint_SUBDIR_included_FALSE!$kdeprint_SUBDIR_included_FALSE$ac_delim
-kabc_SUBDIR_included_TRUE!$kabc_SUBDIR_included_TRUE$ac_delim
-kabc_SUBDIR_included_FALSE!$kabc_SUBDIR_included_FALSE$ac_delim
-kspell2_SUBDIR_included_TRUE!$kspell2_SUBDIR_included_TRUE$ac_delim
-kspell2_SUBDIR_included_FALSE!$kspell2_SUBDIR_included_FALSE$ac_delim
-kmdi_SUBDIR_included_TRUE!$kmdi_SUBDIR_included_TRUE$ac_delim
-kmdi_SUBDIR_included_FALSE!$kmdi_SUBDIR_included_FALSE$ac_delim
-kcmshell_SUBDIR_included_TRUE!$kcmshell_SUBDIR_included_TRUE$ac_delim
-kcmshell_SUBDIR_included_FALSE!$kcmshell_SUBDIR_included_FALSE$ac_delim
-khtml_SUBDIR_included_TRUE!$khtml_SUBDIR_included_TRUE$ac_delim
-khtml_SUBDIR_included_FALSE!$khtml_SUBDIR_included_FALSE$ac_delim
-interfaces_SUBDIR_included_TRUE!$interfaces_SUBDIR_included_TRUE$ac_delim
-interfaces_SUBDIR_included_FALSE!$interfaces_SUBDIR_included_FALSE$ac_delim
-kdewidgets_SUBDIR_included_TRUE!$kdewidgets_SUBDIR_included_TRUE$ac_delim
-kdewidgets_SUBDIR_included_FALSE!$kdewidgets_SUBDIR_included_FALSE$ac_delim
-kate_SUBDIR_included_TRUE!$kate_SUBDIR_included_TRUE$ac_delim
-kate_SUBDIR_included_FALSE!$kate_SUBDIR_included_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -55768,19 +56719,133 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -55809,26 +56874,38 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -55838,7 +56915,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -55864,7 +56941,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -55873,7 +56950,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -55894,17 +56971,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -55949,12 +57026,13 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -55963,13 +57041,14 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -55983,15 +57062,16 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -56002,121 +57082,60 @@
 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
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -56131,7 +57150,7 @@
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -56151,30 +57170,40 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # 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.
-  # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # 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.
+    # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -56192,33 +57221,33 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -56236,7 +57265,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
+      { as_dir=$dirpart/$fdir
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
@@ -56244,7 +57273,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -56253,7 +57282,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -56274,13 +57303,14 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
 
   esac
@@ -56297,6 +57327,11 @@
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -56318,6 +57353,10 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 if test "$have_libdns_sd" = "no"; then
   echo ""
--- kdelibs-3.5.10.dfsg.1.orig/messages.po
+++ kdelibs-3.5.10.dfsg.1/messages.po
@@ -0,0 +1,8495 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-04-30 13:55+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"
+
+#: rc.cpp:3
+msgid "&Certificate"
+msgstr ""
+
+#: obj-i486-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp:64 rc.cpp:6
+msgid "Editor Chooser"
+msgstr ""
+
+#: obj-i486-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp:65 rc.cpp:9
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:119 rc.cpp:13
+msgid "Alternate shortcut:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:120 rc.cpp:16
+msgid "Primary shortcut:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:123 rc.cpp:21
+msgid ""
+"The currently set shortcut or the shortcut you are entering will show up "
+"here."
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:124
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:126
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.cpp:74 rc.cpp:24 rc.cpp:30
+#: rc.cpp:51
+msgid "x"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:125
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:127
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.cpp:75 rc.cpp:27 rc.cpp:33
+#: rc.cpp:54
+msgid "Clear shortcut"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:128 rc.cpp:36
+msgid "Multi-key mode"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:129 rc.cpp:39
+msgid "Enable the entry of multi-key shortcuts"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:130 rc.cpp:42
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.cpp:72 rc.cpp:45
+msgid "Shortcut:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.cpp:73 rc.cpp:48
+msgid "Alt+Tab"
+msgstr ""
+
+#: rc.cpp:72 rc.cpp:75
+msgid "&Go"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:133
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:135 rc.cpp:93 rc.cpp:217
+msgid "Unknown word:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:134
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:140
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:136
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:142 rc.cpp:96 rc.cpp:108
+#: rc.cpp:220 rc.cpp:232
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:138
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:140 rc.cpp:102 rc.cpp:226
+msgid "<b>misspelled</b>"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:139
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:141 rc.cpp:105 rc.cpp:229
+msgid "Unknown word"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:144
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:146 rc.cpp:114 rc.cpp:238
+msgid "&Language:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:145
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:195
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:147
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:178 rc.cpp:117 rc.cpp:212
+#: rc.cpp:241 rc.cpp:299
+msgid ""
+"<qt>\n"
+"<p>Select the language of the document you are proofing here.</p>\n"
+"</qt>"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:148
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:150 rc.cpp:122 rc.cpp:246
+msgid "... the <b>misspelled</b> word shown in context ..."
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:149
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:151 rc.cpp:125 rc.cpp:249
+msgid "Text excerpt showing the unknown word in its context."
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:150
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:152 rc.cpp:128 rc.cpp:252
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:153
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:155 rc.cpp:133 rc.cpp:257
+msgid "<< Add to Dictionary"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:154
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:156 rc.cpp:136 rc.cpp:260
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:158
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:186 rc.cpp:142 rc.cpp:315
+msgid "R&eplace All"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:159
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:187 rc.cpp:145 rc.cpp:318
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:66
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:162
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:62
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:160 rc.cpp:150 rc.cpp:266
+msgid "Suggested Words"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:163
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:161 rc.cpp:153 rc.cpp:269
+msgid "Suggestion List"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:164
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:162 rc.cpp:156 rc.cpp:272
+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 ""
+
+#: kdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:168
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:182 rc.cpp:162 rc.cpp:307
+msgid "&Replace"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:169
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:183 rc.cpp:165 rc.cpp:310
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:172
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:166 rc.cpp:170 rc.cpp:278
+msgid "Replace &with:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:173
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:187
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:167
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:171 rc.cpp:173 rc.cpp:197
+#: rc.cpp:281 rc.cpp:287
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:177
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:190 rc.cpp:179 rc.cpp:323
+msgid "&Ignore"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:178
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:191 rc.cpp:182 rc.cpp:326
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:182
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:195 rc.cpp:188 rc.cpp:332
+msgid "I&gnore All"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:183
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:196
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:201 rc.cpp:191 rc.cpp:335
+#: rc.cpp:344
+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 ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:191
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:181 rc.cpp:203 rc.cpp:304
+msgid "S&uggest"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:294 obj-i486-linux-gnu/kdeui/kspellui.cpp:193
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:176 rc.cpp:206 rc.cpp:293
+msgid "English"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdeui/kspellui.cpp:194
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:177 rc.cpp:209 rc.cpp:296
+msgid "Language Selection"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp:200 rc.cpp:341
+msgid "Autocorrect"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:87 rc.cpp:350
+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 ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:89 rc.cpp:356
+msgid "Enable &background spellchecking"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:90 rc.cpp:359
+msgid ""
+"If checked, the \"spell as you type\" mode is active and all misspelled "
+"words are immediately highlighted."
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:91 rc.cpp:362
+msgid "Skip all &uppercase words"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:92 rc.cpp:365
+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 ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:93 rc.cpp:368
+msgid "S&kip run-together words"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:94 rc.cpp:371
+msgid ""
+"If checked, concatenated words made of existing words are not spell checked. "
+"This is useful in some languages."
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:95 rc.cpp:374
+msgid "Default language:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:96 rc.cpp:377
+msgid "Ignore These Words"
+msgstr ""
+
+#: obj-i486-linux-gnu/kspell2/ui/configui.cpp:97 rc.cpp:380
+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 ""
+
+#: rc.cpp:395
+msgid "Frame"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/kjserrordlg.cc:90 rc.cpp:398
+msgid "JavaScript Errors"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/kjserrordlg.cc:91 rc.cpp:401
+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 ""
+
+#: kdeui/kstdaction_p.h:58 kdeui/kstdguiitem.cpp:161
+#: obj-i486-linux-gnu/khtml/kjserrordlg.cc:93 rc.cpp:407
+msgid "C&lear"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:147 rc.cpp:414
+msgid "Document Information"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:148 rc.cpp:417
+msgid "General"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:149 rc.cpp:420
+msgid "URL:"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:150 rc.cpp:423
+msgid "Title:"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:151 rc.cpp:426
+msgid "Last modified:"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:152 rc.cpp:429
+msgid "Document encoding:"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:153 rc.cpp:432
+msgid "HTTP Headers"
+msgstr ""
+
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:99
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:154 rc.cpp:435
+msgid "Property"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:132
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:100
+#: obj-i486-linux-gnu/khtml/htmlpageinfo.cc:155 rc.cpp:438
+msgid "Value"
+msgstr ""
+
+#: rc.cpp:444
+msgid "Additional domains for browsing"
+msgstr ""
+
+#: rc.cpp:447
+msgid "List of 'wide-area' (non link-local) domains that should be browsed."
+msgstr ""
+
+#: rc.cpp:450
+msgid "Browse local network"
+msgstr ""
+
+#: rc.cpp:453
+msgid ""
+"If true .local domain will be browsed. It is always link-local, using "
+"multicast DNS."
+msgstr ""
+
+#: rc.cpp:456
+msgid "Recursive search for domains"
+msgstr ""
+
+#: rc.cpp:459
+msgid "Removed in KDE 3.5.0"
+msgstr ""
+
+#: rc.cpp:462
+msgid ""
+"Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS "
+"server)"
+msgstr ""
+
+#: rc.cpp:465
+msgid ""
+"Specifies if publishing should be by default link-local using multicast DNS "
+"(LAN) or 'wide-area' using normal DNS server (WAN)."
+msgstr ""
+
+#: rc.cpp:468
+msgid "Name of default publishing domain for WAN"
+msgstr ""
+
+#: rc.cpp:471
+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 ""
+
+#: kjs/internal.cpp:135
+msgid "Undefined value"
+msgstr ""
+
+#: kjs/internal.cpp:166
+msgid "Null value"
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: 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 ""
+
+#: kded/kded.cpp:737
+msgid "Check Sycoca database only once"
+msgstr ""
+
+#: kded/kded.cpp:877
+msgid "KDE Daemon"
+msgstr ""
+
+#: kded/kded.cpp:879
+msgid "KDE Daemon - triggers Sycoca database updates when needed"
+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/kbuildsycoca.cpp:724 kded/kbuildsycoca.cpp:725 kded/kde-menu.cpp:119
+#: kded/khostname.cpp:362 kdeui/kaboutdialog.cpp:90
+msgid "Author"
+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/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: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/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 ""
+
+#: 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/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 ""
+
+#: kdecore/ksocks.cpp:135
+msgid "NEC SOCKS client"
+msgstr ""
+
+#: kdecore/ksocks.cpp:170
+msgid "Dante SOCKS client"
+msgstr ""
+
+#: kdecore/kapplication.cpp:931
+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:1404
+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:1408
+msgid ""
+"\n"
+"\n"
+"Please check that the \"dcopserver\" program is running!"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1415
+msgid "DCOP communications error (%1)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1433
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1435
+msgid "Use the QWS display 'displayname'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1437
+msgid "Restore the application for the given 'sessionId'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1438
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1439
+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:1440
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1441
+msgid ""
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1442
+msgid "switches to synchronous mode for debugging"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1444
+msgid "defines the application font"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1446
+msgid ""
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1448
+msgid "sets the default foreground color"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1450
+msgid "sets the default button color"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1451
+msgid "sets the application name"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1452
+msgid "sets the application title (caption)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1454
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1455
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1456
+msgid "set XIM server"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1457
+msgid "disable XIM"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1460
+msgid "forces the application to run as QWS Server"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1462
+msgid "mirrors the whole layout of widgets"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1468
+msgid "Use 'caption' as name in the titlebar"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1469
+msgid "Use 'icon' as the application icon"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1470
+msgid "Use 'icon' as the icon in the titlebar"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1471
+msgid "Use alternative configuration file"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1472
+msgid "Use the DCOP Server specified by 'server'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1473
+msgid "Disable crash handler, to get core dumps"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1474
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1475
+msgid "sets the application GUI style"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1476
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1516
+msgid "The style %1 was not found\n"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
+#: kstyles/web/webstyle.cpp:1604
+msgid "modified"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2243 kdecore/kapplication.cpp:2273
+msgid "Could not Launch Help Center"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2244 kdecore/kapplication.cpp:2274
+#, c-format
+msgid ""
+"Could not launch the KDE Help Center:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2544
+msgid "Could not Launch Mail Client"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2545
+#, c-format
+msgid ""
+"Could not launch the mail client:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2566
+msgid "Could not Launch Browser"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2567
+#, c-format
+msgid ""
+"Could not launch the browser:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2631
+msgid "Could not register with DCOP.\n"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2666
+msgid "KLauncher could not be reached via DCOP.\n"
+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/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/kcalendarsystemgregorian.cpp:91 kdecore/klocale.cpp:562
+msgid ""
+"_: January\n"
+"Jan"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:93 kdecore/klocale.cpp:563
+msgid ""
+"_: February\n"
+"Feb"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:95 kdecore/klocale.cpp:564
+msgid ""
+"_: March\n"
+"Mar"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:97 kdecore/klocale.cpp:565
+msgid ""
+"_: April\n"
+"Apr"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:99 kdecore/klocale.cpp:566
+msgid ""
+"_: May short\n"
+"May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:101 kdecore/klocale.cpp:567
+msgid ""
+"_: June\n"
+"Jun"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:103 kdecore/klocale.cpp:568
+msgid ""
+"_: July\n"
+"Jul"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:105 kdecore/klocale.cpp:569
+msgid ""
+"_: August\n"
+"Aug"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:107 kdecore/klocale.cpp:570
+msgid ""
+"_: September\n"
+"Sep"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:109 kdecore/klocale.cpp:571
+msgid ""
+"_: October\n"
+"Oct"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:111 kdecore/klocale.cpp:572
+msgid ""
+"_: November\n"
+"Nov"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:113 kdecore/klocale.cpp:573
+msgid ""
+"_: December\n"
+"Dec"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:119 kdecore/klocale.cpp:578
+msgid "January"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:121 kdecore/klocale.cpp:579
+msgid "February"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:123 kdecore/klocale.cpp:580
+msgid "March"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:125 kdecore/klocale.cpp:581
+msgid "April"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:127 kdecore/klocale.cpp:582
+msgid ""
+"_: May long\n"
+"May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:129 kdecore/klocale.cpp:583
+msgid "June"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:131 kdecore/klocale.cpp:584
+msgid "July"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:133 kdecore/klocale.cpp:585
+msgid "August"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:135 kdecore/klocale.cpp:586
+msgid "September"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:137 kdecore/klocale.cpp:587
+msgid "October"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:139 kdecore/klocale.cpp:588
+msgid "November"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:141 kdecore/klocale.cpp:589
+msgid "December"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:156 kdecore/klocale.cpp:600
+msgid ""
+"_: of January\n"
+"of Jan"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:158 kdecore/klocale.cpp:601
+msgid ""
+"_: of February\n"
+"of Feb"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:160 kdecore/klocale.cpp:602
+msgid ""
+"_: of March\n"
+"of Mar"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:162 kdecore/klocale.cpp:603
+msgid ""
+"_: of April\n"
+"of Apr"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:164 kdecore/klocale.cpp:604
+msgid ""
+"_: of May short\n"
+"of May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:166 kdecore/klocale.cpp:605
+msgid ""
+"_: of June\n"
+"of Jun"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:168 kdecore/klocale.cpp:606
+msgid ""
+"_: of July\n"
+"of Jul"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:170 kdecore/klocale.cpp:607
+msgid ""
+"_: of August\n"
+"of Aug"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:172 kdecore/klocale.cpp:608
+msgid ""
+"_: of September\n"
+"of Sep"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:174 kdecore/klocale.cpp:609
+msgid ""
+"_: of October\n"
+"of Oct"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:176 kdecore/klocale.cpp:610
+msgid ""
+"_: of November\n"
+"of Nov"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:178 kdecore/klocale.cpp:611
+msgid ""
+"_: of December\n"
+"of Dec"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:184 kdecore/klocale.cpp:616
+msgid "of January"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:186 kdecore/klocale.cpp:617
+msgid "of February"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:188 kdecore/klocale.cpp:618
+msgid "of March"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:190 kdecore/klocale.cpp:619
+msgid "of April"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:192 kdecore/klocale.cpp:620
+msgid ""
+"_: of May long\n"
+"of May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:194 kdecore/klocale.cpp:621
+msgid "of June"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:196 kdecore/klocale.cpp:622
+msgid "of July"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:198 kdecore/klocale.cpp:623
+msgid "of August"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:200 kdecore/klocale.cpp:624
+msgid "of September"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:202 kdecore/klocale.cpp:625
+msgid "of October"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:204 kdecore/klocale.cpp:626
+msgid "of November"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:206 kdecore/klocale.cpp:627
+msgid "of December"
+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/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/kcmdlineargs.cpp:500 kdecore/kcmdlineargs.cpp:516
+msgid "Unknown option '%1'."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:524
+msgid "'%1' missing."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:619
+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:622
+msgid "This application was written by somebody who wants to remain anonymous."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:629
+msgid "Please use http://bugs.kde.org to report bugs.\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:632 kdecore/kcmdlineargs.cpp:634
+msgid "Please report bugs to %1.\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:660
+msgid "Unexpected argument '%1'."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:765
+msgid "Use --help to get a list of available command line options."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:780
+msgid ""
+"\n"
+"%1:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:789
+msgid "[options] "
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:796
+msgid "[%1-options]"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:816
+msgid "Usage: %1 %2\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:819
+msgid "Generic options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:820
+msgid "Show help about options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:828
+msgid "Show %1 specific options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:835
+msgid "Show all options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:836
+msgid "Show author information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:837
+msgid "Show version information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:838
+msgid "Show license information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:839
+msgid "End of options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:861
+msgid "%1 options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:863
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:920
+msgid ""
+"\n"
+"Arguments:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:1282
+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/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:71 kutils/kfind.cpp:47
+msgid "Find Next"
+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:78 kutils/kfinddialog.cpp:451
+msgid "End of Line"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:79
+msgid "Prior"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:80
+msgid ""
+"_: Opposite to Prior\n"
+"Next"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976
+msgid "Go to Line"
+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:99 kdecore/kstdaccel.cpp:100 kdeui/klineedit.cpp:886
+msgid "Text Completion"
+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 ""
+
+#: kabc/address.cpp:312 kabc/phonenumber.cpp:199 kdecore/kcharsets.cpp:43
+msgid "Other"
+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:47
+msgid "Chinese Simplified"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:48
+msgid "Chinese Traditional"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:49
+msgid "Cyrillic"
+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:656 khtml/khtml_part.cpp:285
+msgid "Hebrew"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
+msgid "Japanese"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:53
+msgid "Korean"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:54
+msgid "Thai"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:55 kdeui/ksconfig.cpp:240 kdeui/ksconfig.cpp:400
+#: kdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290
+msgid "Turkish"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
+msgid "Western European"
+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/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/klocale.cpp:226
+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/klocale.cpp:1782 kdecore/klocale.cpp:1922
+msgid "pm"
+msgstr ""
+
+#: kdecore/klocale.cpp:1791 kdecore/klocale.cpp:1924
+msgid "am"
+msgstr ""
+
+#: kdecore/klocale.cpp:1965
+msgid ""
+"_: concatenation of dates and time\n"
+"%1 %2"
+msgstr ""
+
+#: kdecore/klocale.cpp:2456
+msgid "&Next"
+msgstr ""
+
+#: kdecore/kglobalsettings.cpp:527
+msgid "Trash"
+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/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/kwinmodule.cpp:456
+#, c-format
+msgid "Desktop %1"
+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/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/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/network/ksocketaddress.cpp:625
+#, c-format
+msgid ""
+"_: 1: the unknown socket address family number\n"
+"Unknown family %1"
+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/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/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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: interfaces/ktexteditor/editorchooser.cpp:60
+msgid "System Default (%1)"
+msgstr ""
+
+#: kstyles/web/plugin.cpp:9
+msgid "Web style plugin"
+msgstr ""
+
+#: kstyles/klegacy/plugin.cpp:28
+msgid "KDE LegacyStyle plugin"
+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 ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:215
+msgid "KDE Wallet Wizard"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:216
+msgid "<u>KWallet</u> - The KDE Wallet System"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:217
+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-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:219
+msgid "&Basic setup (recommended)"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:220
+msgid "&Advanced setup"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:221
+msgid "Introduction"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:222
+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-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:224
+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-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:225
+msgid "Enter a new password:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:226
+msgid "Verify password:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:227
+msgid "Yes, I wish to use the KDE wallet to store my personal information."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:229
+msgid "Password Selection"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:230
+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-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:231
+msgid "Store network passwords and local passwords in separate wallet files"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:232
+msgid "Automatically close idle wallets"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:233
+msgid "Security Level"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:86
+msgid "Allow &Once"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:87
+msgid "Allow &Always"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:88
+msgid "&Deny"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:89
+msgid "Deny &Forever"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:139
+msgid "Terminal"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:140
+msgid "&Run in terminal"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:141
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:142
+msgid "&Terminal options:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:143
+msgid "Do not &close when command exits"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:144
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:145
+msgid "User"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:146
+msgid "Ru&n as a different user"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:147
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:148
+msgid "&Username:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:149
+msgid "Enter the user name you want to run the application as."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:150
+msgid "Enter the user name you want to run the application as here."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:151
+msgid "Startup"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:152
+msgid "Enable &launch feedback"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:153
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:154
+msgid "&Place in system tray"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:155
+msgid ""
+"Check this option if you want to have a system tray handle for your "
+"application."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:156
+msgid "&DCOP registration:"
+msgstr ""
+
+#: kdeui/kkeybutton.cpp:89 kdeui/kkeydialog.cpp:536 kdeui/klineedit.cpp:889
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:158
+msgid "None"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:159
+msgid "Multiple Instances"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:160
+msgid "Single Instance"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:161
+msgid "Run Until Finished"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:42
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:139
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:36
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:62
+msgid "Mimetype"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:43
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:140
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:37
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:63
+msgid "Description"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:61
+msgid "Select one or more file types to add:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:64
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:135
+msgid "&Supported file types:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:136
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:141
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:144
+msgid "&Name:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:145
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:146
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:147
+msgid "&Description:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:148
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:149
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:150
+msgid "Comm&ent:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:151
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:152
+msgid "Type any comment you think is useful here."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:153
+msgid "Co&mmand:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:154
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:166
+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 ""
+
+#: kdeui/klineeditdlg.cpp:92
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:178
+msgid "&Browse..."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:179
+msgid ""
+"Click here to browse your file system in order to find the desired "
+"executable."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:180
+msgid "&Work path:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:181
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:182
+msgid "Sets the working directory for your application."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:183
+msgid "Add..."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:184
+msgid ""
+"Click on this button if you want to add a type of file (mimetype) that your "
+"application can handle."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:186
+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-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:187
+msgid "Ad&vanced Options"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:188
+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-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:52
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:213
+msgid "Events"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:214
+msgid "Quick Controls"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:215
+msgid "Apply to &all applications"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:216
+msgid "Turn O&ff All"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:217
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:219
+msgid "Allows you to change the behavior for all events at once"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:218
+msgid "Turn O&n All"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:220
+msgid "Actions"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:221
+msgid "Print a message to standard &error output"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:222
+msgid "Show a &message in a pop-up window"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:223
+msgid "E&xecute a program:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:224
+msgid "Play a &sound:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:226
+msgid "Test the Sound"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:227
+msgid "Mark &taskbar entry"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:228
+msgid "&Log to a file:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:229
+msgid "&Use a passive window that does not interrupt other work"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:230
+msgid "Less Options"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp:231
+msgid "Player Settings"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:14 obj-i486-linux-gnu/kdecore/kde-config.cpp:14
+msgid "A little program to output installation paths"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:18 obj-i486-linux-gnu/kdecore/kde-config.cpp:18
+msgid "expand ${prefix} and ${exec_prefix} in output"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:19 obj-i486-linux-gnu/kdecore/kde-config.cpp:19
+msgid "Compiled in prefix for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:20 obj-i486-linux-gnu/kdecore/kde-config.cpp:20
+msgid "Compiled in exec_prefix for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:21 obj-i486-linux-gnu/kdecore/kde-config.cpp:21
+msgid "Compiled in library path suffix"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:22 obj-i486-linux-gnu/kdecore/kde-config.cpp:22
+msgid "Prefix in $HOME used to write files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:23 obj-i486-linux-gnu/kdecore/kde-config.cpp:23
+msgid "Compiled in version string for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:24 obj-i486-linux-gnu/kdecore/kde-config.cpp:24
+msgid "Available KDE resource types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:25 obj-i486-linux-gnu/kdecore/kde-config.cpp:25
+msgid "Search path for resource type"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:26 obj-i486-linux-gnu/kdecore/kde-config.cpp:26
+msgid "User path: desktop|autostart|trash|document"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:27 obj-i486-linux-gnu/kdecore/kde-config.cpp:27
+msgid "Prefix to install resource files to"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:168 obj-i486-linux-gnu/kdecore/kde-config.cpp:168
+msgid "Applications menu (.desktop files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:169 obj-i486-linux-gnu/kdecore/kde-config.cpp:169
+msgid "CGIs to run from kdehelp"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:170 obj-i486-linux-gnu/kdecore/kde-config.cpp:170
+msgid "Configuration files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:171 obj-i486-linux-gnu/kdecore/kde-config.cpp:171
+msgid "Where applications store data"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:172 obj-i486-linux-gnu/kdecore/kde-config.cpp:172
+msgid "Executables in $prefix/bin"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:173 obj-i486-linux-gnu/kdecore/kde-config.cpp:173
+msgid "HTML documentation"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:174 obj-i486-linux-gnu/kdecore/kde-config.cpp:174
+msgid "Icons"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:175 obj-i486-linux-gnu/kdecore/kde-config.cpp:175
+msgid "Configuration description files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:176 obj-i486-linux-gnu/kdecore/kde-config.cpp:176
+msgid "Libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:177 obj-i486-linux-gnu/kdecore/kde-config.cpp:177
+msgid "Includes/Headers"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:178 obj-i486-linux-gnu/kdecore/kde-config.cpp:178
+msgid "Translation files for KLocale"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:179 obj-i486-linux-gnu/kdecore/kde-config.cpp:179
+msgid "Mime types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:180 obj-i486-linux-gnu/kdecore/kde-config.cpp:180
+msgid "Loadable modules"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:181 obj-i486-linux-gnu/kdecore/kde-config.cpp:181
+msgid "Qt plugins"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:182 obj-i486-linux-gnu/kdecore/kde-config.cpp:182
+msgid "Services"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:183 obj-i486-linux-gnu/kdecore/kde-config.cpp:183
+msgid "Service types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:184 obj-i486-linux-gnu/kdecore/kde-config.cpp:184
+msgid "Application sounds"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:185 obj-i486-linux-gnu/kdecore/kde-config.cpp:185
+msgid "Templates"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:186 obj-i486-linux-gnu/kdecore/kde-config.cpp:186
+msgid "Wallpapers"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:187 obj-i486-linux-gnu/kdecore/kde-config.cpp:187
+msgid "XDG Application menu (.desktop files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:188 obj-i486-linux-gnu/kdecore/kde-config.cpp:188
+msgid "XDG Menu descriptions (.directory files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:189 obj-i486-linux-gnu/kdecore/kde-config.cpp:189
+msgid "XDG Menu layout (.menu files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:190 obj-i486-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-i486-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-i486-linux-gnu/kdecore/kde-config.cpp:203
+msgid "%1 - unknown type\n"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:228 obj-i486-linux-gnu/kdecore/kde-config.cpp:228
+msgid "%1 - unknown type of userpath\n"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdoctools/xslt_pure.cpp:55
+msgid "Parsing stylesheet"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdoctools/xslt_pure.cpp:69
+msgid "Parsing document"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdoctools/xslt_pure.cpp:78
+msgid "Applying stylesheet"
+msgstr ""
+
+#: obj-i486-linux-gnu/kdoctools/xslt_pure.cpp:86
+msgid "Writing document"
+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/kfinddialog.cpp:55 kutils/kfinddialog.cpp:66
+msgid "Find Text"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:77
+msgid "Replace Text"
+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 ""
+
+#: 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/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/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/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/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:335 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
+msgid "Name"
+msgstr ""
+
+#: kutils/kpluginselector.cpp:536
+msgid "(This plugin is not configurable)"
+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:659
+msgid "Continue from the end?"
+msgstr ""
+
+#: kutils/kfind.cpp:660
+msgid "Continue from the beginning?"
+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/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/ksettings/dialog.cpp:590
+msgid "Select Components..."
+msgstr ""
+
+#: kutils/ksettings/componentsdialog.cpp:48
+msgid "Select Components"
+msgstr ""
+
+#: kdeui/kshortcutdialog.cpp:68
+msgid "Configure Shortcut"
+msgstr ""
+
+#: kdeui/kshortcutdialog.cpp:71
+msgid "Advanced"
+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/ktimezonewidget.cpp:45
+msgid "Area"
+msgstr ""
+
+#: kabc/address.cpp:217 kdeui/ktimezonewidget.cpp:46
+msgid "Region"
+msgstr ""
+
+#: kab/addressbook.cc:295 kdeui/ktimezonewidget.cpp:47
+msgid "Comment"
+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/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/ktoolbarhandler.cpp:86
+msgid "Show Toolbar"
+msgstr ""
+
+#: kdeui/ktoolbarhandler.cpp:87
+msgid "Hide Toolbar"
+msgstr ""
+
+#: kdeui/ktoolbarhandler.cpp:91
+msgid "Toolbars"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+msgid "&Yes"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
+msgid "&No"
+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/kstdaction.cpp:62 kdeui/kstdguiitem.cpp:168
+msgid ""
+"_: show help\n"
+"&Help"
+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/kstdaction.cpp:51 kdeui/kstdguiitem.cpp:188
+msgid ""
+"_: go back\n"
+"&Back"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:189
+msgid "Go back one step"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:56 kdeui/kstdguiitem.cpp:196
+msgid ""
+"_: go forward\n"
+"&Forward"
+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/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
+#: knewstuff/downloaddialog.cpp:505
+msgid "Details"
+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/kaboutdialog.cpp:1535 kdeui/khelpmenu.cpp:235
+#: kdeui/kmessagebox.cpp:975
+#, c-format
+msgid "About %1"
+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 ""
+
+#: 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:383 kdeui/kfontdialog.cpp:144
+msgid "Font:"
+msgstr ""
+
+#: kdeui/kcharselect.cpp:394
+msgid "Table:"
+msgstr ""
+
+#: kdeui/kcharselect.cpp:404
+msgid "&Unicode code point:"
+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:174 knewstuff/uploaddialog.cpp:73
+msgid "Version:"
+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/kxmlguibuilder.cpp:166 kdeui/kxmlguibuilder.cpp:365
+msgid "No text!"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:71 kabc/addresseedialog.cpp:101
+#: kabc/distributionlistdialog.cpp:190 kabc/distributionlisteditor.cpp:143
+#: kabc/field.cpp:211 kabc/scripts/field.src.cpp:104 kdeui/kaboutdialog.cpp:91
+msgid "Email"
+msgstr ""
+
+#: kabc/addressee.cpp:841 kdeui/kaboutdialog.cpp:92
+msgid "Homepage"
+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/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/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/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/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:324 khtml/khtml_part.cpp:288
+msgid "Russian"
+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:342 khtml/khtml_part.cpp:291
+msgid "Ukrainian"
+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:594
+msgid "ISpell Default"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:488 kdeui/ksconfig.cpp:642
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1 [%2]"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:508 kdeui/ksconfig.cpp:668
+msgid "ASpell Default"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:573 kdeui/ksconfig.cpp:733
+#, c-format
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1"
+msgstr ""
+
+#: kdeui/kcolorcombo.cpp:187 kdeui/kcolorcombo.cpp:240
+msgid "Custom..."
+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 ""
+
+#: 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 ""
+
+#: kdeui/keditcl2.cpp:984
+msgid "Go to line:"
+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/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/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/kpixmapregionselectorwidget.cpp:141
+msgid "Image Operations"
+msgstr ""
+
+#: kdeui/kpixmapregionselectorwidget.cpp:143
+msgid "&Rotate Clockwise"
+msgstr ""
+
+#: kdeui/kpixmapregionselectorwidget.cpp:148
+msgid "Rotate &Counterclockwise"
+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 ""
+
+#: kdeui/keditlistbox.cpp:124
+msgid "&Add"
+msgstr ""
+
+#: kdeui/keditlistbox.cpp:148
+msgid "Move &Up"
+msgstr ""
+
+#: kdeui/keditlistbox.cpp:153
+msgid "Move &Down"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:134 kdeui/kstdaction_p.h:108
+msgid "%1 &Handbook"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:143
+msgid "What's &This"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:154 kdeui/kstdaction_p.h:111
+msgid "&Report Bug..."
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:163 kdeui/kstdaction_p.h:112
+msgid "Switch application &language..."
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:171 kdeui/kstdaction_p.h:115
+msgid "&Get Help Online"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:172
+msgid "&Translate this Application"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:178 kdeui/kstdaction_p.h:113
+#, c-format
+msgid "&About %1"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:184 kdeui/kstdaction_p.h:114
+msgid "About &KDE"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:61
+msgid ""
+"_: beginning (of line)\n"
+"&Home"
+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/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/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/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/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/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/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/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/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
+msgid "&Minimize"
+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/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:1133 knewstuff/uploaddialog.cpp:58
+#: kresources/configdialog.cpp:53
+msgid "Name:"
+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/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:447 khtml/html/html_formimpl.cpp:2119
+#: khtml/khtmlview.cpp:2541 khtml/khtmlview.cpp:2574
+msgid "Reset"
+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/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/kdockwidget.cpp:2939 kmdi/kmdi/guiclient.cpp:152
+#: kmdi/kmdiguiclient.cpp:265
+#, c-format
+msgid "Hide %1"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:2945 kmdi/kmdi/guiclient.cpp:148
+#: kmdi/kmdiguiclient.cpp:260
+#, c-format
+msgid "Show %1"
+msgstr ""
+
+#: kdeui/kactionselector.cpp:69
+msgid "&Available:"
+msgstr ""
+
+#: kdeui/kactionselector.cpp:84
+msgid "&Selected:"
+msgstr ""
+
+#: kdeui/kauthicon.cpp:99
+msgid "Editing disabled"
+msgstr ""
+
+#: kdeui/kauthicon.cpp:100
+msgid "Editing enabled"
+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/kwizard.cpp:48
+msgid "&Back"
+msgstr ""
+
+#: kdeui/kwizard.cpp:49
+msgid ""
+"_: Opposite to Back\n"
+"&Next"
+msgstr ""
+
+#: kdeui/ktabbar.cpp:196
+msgid "Close this tab"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:90
+msgid "Switch application language"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:96
+msgid "Please choose language which should be used for this application"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:123
+msgid "Add fallback language"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:124
+msgid ""
+"Adds one more language which will be used if other translations do not "
+"contain proper translation"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:222
+msgid ""
+"Language for this application has been changed. The change will take effect "
+"upon next start of application"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:223
+msgid "Application language changed"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:282
+msgid "Primary language:"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:282
+msgid "Fallback language:"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:316
+msgid ""
+"This is main application language which will be used first before any other "
+"languages"
+msgstr ""
+
+#: kdeui/kswitchlanguagedialog.cpp:320
+msgid ""
+"This is language which will be used if any previous languages does not "
+"contain proper translation"
+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/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
+msgid "Spell Checking"
+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/kjanuswidget.cpp:156
+msgid "Empty Page"
+msgstr ""
+
+#: kdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
+msgid "Clear &History"
+msgstr ""
+
+#: kdeui/kcombobox.cpp:584
+msgid "No further item in the history."
+msgstr ""
+
+#: kspell2/ui/configdialog.cpp:38
+msgid "KSpell2 Configuration"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1625
+msgid "Find stopped."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1636
+msgid "Starting -- find links as you type"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1642
+msgid "Starting -- find text as you type"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1663
+msgid "Link found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1668
+msgid "Link not found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1676
+msgid "Text found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1681
+msgid "Text not found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1725
+msgid "Access Keys activated"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:1521 khtml/html/html_formimpl.cpp:2127
+#: khtml/khtml_part.cpp:4822 khtml/khtmlview.cpp:2527 khtml/khtmlview.cpp:2569
+msgid "Submit"
+msgstr ""
+
+#: khtml/khtmlview.cpp:2756
+#, c-format
+msgid "Print %1"
+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:564 khtml/khtml_part.cpp:256
+msgid "View Frame Source"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:566
+msgid "View Frame Information"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:570 khtml/khtml_part.cpp:404
+msgid "Print Frame..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:571 khtml/khtml_part.cpp:262
+msgid "Save &Frame As..."
+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:688 khtml/khtml_ext.cpp:701
+msgid "Enter the URL:"
+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:828 knewstuff/knewstuffgeneric.cpp:141
+msgid "Overwrite"
+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 ""
+
+#: 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/khtml_part.cpp:255
+msgid "View Do&cument 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_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 ""
+
+#: 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_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:3738 khtml/khtml_part.cpp:3825
+#: khtml/khtml_part.cpp:3836
+msgid " (In new window)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3777
+msgid "Symbolic Link"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3779
+msgid "%1 (Link)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3799
+msgid "%2 (%1 bytes)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3803
+msgid "%2 (%1 K)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3838
+msgid " (In other frame)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3843
+msgid "Email to: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3849
+msgid " - Subject: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3851
+msgid " - CC: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3853
+msgid " - BCC: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3942
+msgid ""
+"<qt>This untrusted page links to<BR><B>%1</B>.<BR>Do you want to follow the "
+"link?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3943
+msgid "Follow"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4043
+msgid "Frame Information"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4049
+msgid "   <a href=\"%1\">[Properties]</a>"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4129
+msgid "Save Background Image As"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4216
+msgid "Save Frame As"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4256
+msgid "&Find in Frame..."
+msgstr ""
+
+#: khtml/khtml_part.cpp:4763
+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:4766 khtml/khtml_part.cpp:4775
+#: khtml/khtml_part.cpp:4799
+msgid "Network Transmission"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4766 khtml/khtml_part.cpp:4776
+msgid "&Send Unencrypted"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4773
+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:4797
+msgid ""
+"This site is attempting to submit form data via email.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4800
+msgid "&Send Email"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4821
+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:4870
+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:4870
+msgid "KDE"
+msgstr ""
+
+#: khtml/khtml_part.cpp:5776
+msgid "(%1/s)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:6829
+msgid "Security Warning"
+msgstr ""
+
+#: khtml/khtml_part.cpp:6835
+msgid "<qt>Access by untrusted page to<BR><B>%1</B><BR> denied."
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:784 khtml/khtml_part.cpp:6836
+msgid "Security Alert"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7261
+msgid "The wallet '%1' is open and being used for form data and passwords."
+msgstr ""
+
+#: khtml/khtml_part.cpp:7315
+msgid "&Close Wallet"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7358
+msgid "JavaScript &Debugger"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7393
+msgid "This page was prevented from opening a new window via JavaScript."
+msgstr ""
+
+#: khtml/khtml_part.cpp:7399
+msgid "Popup Window Blocked"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7399
+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:7413
+#, c-format
+msgid ""
+"_n: &Show Blocked Popup Window\n"
+"Show %n Blocked Popup Windows"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7414
+msgid "Show Blocked Window Passive Popup &Notification"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7416
+msgid "&Configure JavaScript New Window Policies..."
+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_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/khtml_factory.cpp:177
+msgid "KHTML"
+msgstr ""
+
+#: khtml/khtml_factory.cpp:178
+msgid "Embeddable HTML component"
+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/ecma/kjs_html.cpp:2160 khtml/ecma/kjs_window.cpp:1562
+msgid "Confirmation: JavaScript Popup"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2162
+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:2165
+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/ecma/kjs_html.cpp:2167 khtml/ecma/kjs_window.cpp:1570
+msgid "Allow"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2167 khtml/ecma/kjs_window.cpp:1570
+msgid "Do Not Allow"
+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_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_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/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 ""
+
+#: khtml/xml/dom_docimpl.cpp:2077
+msgid "Basic Page Style"
+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/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 ""
+
+#: 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 ""
+
+#: khtml/java/kjavaappletserver.cpp:801
+msgid "&Reject All"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:807
+msgid "&Grant All"
+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/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 ""
+
+#: kresources/configdialog.cpp:40 kresources/configpage.cpp:103
+#: kresources/configpage.cpp:297
+msgid "Resource Configuration"
+msgstr ""
+
+#: kresources/configdialog.cpp:51
+msgid "General Settings"
+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 ""
+
+#: 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/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 ""
+
+#: kmdi/kmdichildfrmcaption.cpp:71 kmdi/kmdichildview.cpp:63
+#: kmdi/kmdichildview.cpp:89
+msgid "Unnamed"
+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 ""
+
+#: kmdi/kmdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1270
+msgid "&Undock"
+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/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 ""
+
+#: kmdi/kmdi/dockcontainer.cpp:196 kmdi/kmdidockcontainer.cpp:218
+msgid ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+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 ""
+
+#: 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/errorhandler.cpp:42
+msgid "Error in libkabc"
+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/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/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: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/addressbook.cpp:346 kabc/addressbook.cpp:365
+msgid "Unable to load resource '%1'"
+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:601 kabc/phonenumber.cpp:184
+msgid "ISDN"
+msgstr ""
+
+#: kabc/phonenumber.cpp:187
+msgid "PCS"
+msgstr ""
+
+#: kabc/addressee.cpp:607 kabc/phonenumber.cpp:190
+msgid "Pager"
+msgstr ""
+
+#: kabc/addressee.cpp:583 kabc/phonenumber.cpp:193
+msgid "Home Fax"
+msgstr ""
+
+#: kabc/phonenumber.cpp:196
+msgid "Work Fax"
+msgstr ""
+
+#: kabc/field.cpp:192 kabc/scripts/field.src.cpp:85
+msgid "Unknown Field"
+msgstr ""
+
+#: kabc/field.cpp:205 kabc/scripts/field.src.cpp:98
+msgid "All"
+msgstr ""
+
+#: kabc/field.cpp:207 kabc/scripts/field.src.cpp:100
+msgid "Frequent"
+msgstr ""
+
+#: kab/addressbook.cc:192 kabc/field.cpp:209 kabc/scripts/field.src.cpp:102
+msgid ""
+"_: street/postal\n"
+"Address"
+msgstr ""
+
+#: kabc/field.cpp:213 kabc/scripts/field.src.cpp:106
+msgid "Personal"
+msgstr ""
+
+#: kab/addressbook.cc:176 kabc/addressee.cpp:727 kabc/field.cpp:215
+#: kabc/scripts/field.src.cpp:108
+msgid "Organization"
+msgstr ""
+
+#: kab/addressbook.cc:335 kabc/field.cpp:217 kabc/key.cpp:133
+#: kabc/scripts/field.src.cpp:110
+msgid "Custom"
+msgstr ""
+
+#: kabc/field.cpp:219 kabc/scripts/field.src.cpp:112
+msgid "Undefined"
+msgstr ""
+
+#: kabc/ldifconverter.cpp:475
+msgid "List of Emails"
+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/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/addressee.cpp:317 kabc/scripts/addressee.src.cpp:180
+msgid "Unique Identifier"
+msgstr ""
+
+#: kab/addressbook.cc:271 kabc/addressee.cpp:354
+msgid "Formatted Name"
+msgstr ""
+
+#: kabc/addressee.cpp:373
+msgid "Family Name"
+msgstr ""
+
+#: kabc/addressee.cpp:392
+msgid "Given Name"
+msgstr ""
+
+#: kabc/addressee.cpp:411
+msgid "Additional Names"
+msgstr ""
+
+#: kabc/addressee.cpp:430
+msgid "Honorific Prefixes"
+msgstr ""
+
+#: kabc/addressee.cpp:449
+msgid "Honorific Suffixes"
+msgstr ""
+
+#: kabc/addressee.cpp:468
+msgid "Nick Name"
+msgstr ""
+
+#: kab/addressbook.cc:291 kabc/addressee.cpp:487
+msgid "Birthday"
+msgstr ""
+
+#: kabc/addressee.cpp:493
+msgid "Home Address Street"
+msgstr ""
+
+#: kabc/addressee.cpp:499
+msgid "Home Address City"
+msgstr ""
+
+#: kabc/addressee.cpp:505
+msgid "Home Address State"
+msgstr ""
+
+#: kabc/addressee.cpp:511
+msgid "Home Address Zip Code"
+msgstr ""
+
+#: kabc/addressee.cpp:517
+msgid "Home Address Country"
+msgstr ""
+
+#: kabc/addressee.cpp:523
+msgid "Home Address Label"
+msgstr ""
+
+#: kabc/addressee.cpp:529
+msgid "Business Address Street"
+msgstr ""
+
+#: kabc/addressee.cpp:535
+msgid "Business Address City"
+msgstr ""
+
+#: kabc/addressee.cpp:541
+msgid "Business Address State"
+msgstr ""
+
+#: kabc/addressee.cpp:547
+msgid "Business Address Zip Code"
+msgstr ""
+
+#: kabc/addressee.cpp:553
+msgid "Business Address Country"
+msgstr ""
+
+#: kabc/addressee.cpp:559
+msgid "Business Address Label"
+msgstr ""
+
+#: kabc/addressee.cpp:565
+msgid "Home Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:571
+msgid "Business Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:577
+msgid "Mobile Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:589
+msgid "Business Fax"
+msgstr ""
+
+#: kabc/addressee.cpp:595
+msgid "Car Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:613
+msgid "Email Address"
+msgstr ""
+
+#: kabc/addressee.cpp:632
+msgid "Mail Client"
+msgstr ""
+
+#: kabc/addressee.cpp:651
+msgid "Time Zone"
+msgstr ""
+
+#: kabc/addressee.cpp:670
+msgid "Geographic Position"
+msgstr ""
+
+#: kab/addressbook.cc:263 kabc/addressee.cpp:689
+msgid ""
+"_: person\n"
+"Title"
+msgstr ""
+
+#: kabc/addressee.cpp:708
+msgid ""
+"_: person in organization\n"
+"Role"
+msgstr ""
+
+#: kab/addressbook.cc:180 kabc/addressee.cpp:746
+msgid "Department"
+msgstr ""
+
+#: kabc/addressee.cpp:765
+msgid "Note"
+msgstr ""
+
+#: kabc/addressee.cpp:784
+msgid "Product Identifier"
+msgstr ""
+
+#: kabc/addressee.cpp:803
+msgid "Revision Date"
+msgstr ""
+
+#: kabc/addressee.cpp:822
+msgid "Sort String"
+msgstr ""
+
+#: kabc/addressee.cpp:860
+msgid "Security Class"
+msgstr ""
+
+#: kabc/addressee.cpp:879
+msgid "Logo"
+msgstr ""
+
+#: kabc/addressee.cpp:898
+msgid "Photo"
+msgstr ""
+
+#: kabc/addressee.cpp:917
+msgid "Sound"
+msgstr ""
+
+#: kabc/addressee.cpp:936
+msgid "Agent"
+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/resource.cpp:332
+msgid "Loading resource '%1' failed!"
+msgstr ""
+
+#: kabc/resource.cpp:343
+msgid "Saving resource '%1' failed!"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:60
+msgid "Select Addressee"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:95
+msgid "Selected"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:107
+msgid "Unselect"
+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/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/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/key.cpp:136 kabc/secrecy.cpp:80
+msgid "Unknown type"
+msgstr ""
+
+#: kabc/stdaddressbook.cpp:148
+msgid "Unable to save to resource '%1'. It is locked."
+msgstr ""
+
+#: kabc/key.cpp:127
+msgid "X509"
+msgstr ""
+
+#: kabc/key.cpp:130
+msgid "PGP"
+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/vcardparser/testread.cpp:38
+msgid "vCard 2.1"
+msgstr ""
+
+#: kabc/vcard/testwrite.cpp:11
+msgid "TestWritevCard"
+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 ""
+
+#: 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/knewstuffgeneric.cpp:139
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr ""
+
+#: knewstuff/ghns.cpp:50
+msgid "Get hot new stuff:"
+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/knewstuffbutton.cpp:49
+msgid "Download New Stuff"
+msgstr ""
+
+#: knewstuff/knewstuff.cpp:38 knewstuff/knewstuffbutton.cpp:61
+#, c-format
+msgid "Download New %1"
+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/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/uploaddialog.cpp:47
+msgid "Share Hot New Stuff"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:63
+msgid "Author:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:68
+msgid "Email:"
+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/provider.cpp:270
+msgid "Error parsing providers list."
+msgstr ""
+
+#: knewstuff/khotnewstuff.cpp:31
+msgid "Display only media of this type"
+msgstr ""
+
+#: knewstuff/khotnewstuff.cpp:32
+msgid "Provider list to use"
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: kab/addressbook.cc:168
+msgid "Headline"
+msgstr ""
+
+#: kab/addressbook.cc:172
+msgid "Position"
+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 ""
+
+#: kwallet/backend/kwalletbackend.cc:258
+msgid "Already open."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:260
+msgid "Error opening file."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:262
+msgid "Not a wallet file."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:264
+msgid "Unsupported file format revision."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:266
+msgid "Unknown encryption scheme."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:268
+msgid "Corrupt file?"
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:270
+msgid "Error validating wallet integrity. Possibly corrupted."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:274
+msgid "Read error - possibly incorrect password."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:276
+msgid "Decryption error."
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kssl/keygenwizard2.cc:77
+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-i486-linux-gnu/kio/kssl/keygenwizard2.cc:78
+msgid "&Repeat password:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kssl/keygenwizard2.cc:79
+msgid "&Choose password:"
+msgstr ""
+
+#: obj-i486-linux-gnu/kio/kssl/keygenwizard.cc:56
+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 ""
+
+#: 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/kde/kconverttest.cc:23 arts/kde/kiotest.cc:17
+#: arts/kde/kiotestslow.cc:83
+msgid "URL to open"
+msgstr ""
+
+#: arts/kde/kiotest.cc:23 arts/kde/kiotestslow.cc:91
+msgid "KIOTest"
+msgstr ""
+
+#: arts/kde/kconverttest.cc:58 arts/kde/kiotest.cc:23
+#: arts/kde/kiotestslow.cc:91
+msgid "0.1"
+msgstr ""
+
+#: arts/kde/kconverttest.cc:58
+msgid "KConvertTest"
+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 ""
+
+#: 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:116
+msgid "&Translate This Application"
+msgstr ""
--- kdelibs-3.5.10.dfsg.1.orig/files
+++ kdelibs-3.5.10.dfsg.1/files
@@ -0,0 +1,2031 @@
+./common_texts.cpp
+./_translatorinfo.cpp
+./kjs/value.cpp
+./kjs/dtoa.cpp
+./kjs/bool_object.cpp
+./kjs/object_object.cpp
+./kjs/internal.cpp
+./kjs/list.cpp
+./kjs/object.cpp
+./kjs/string_object.cpp
+./kjs/nodes2string.cpp
+./kjs/property_map.cpp
+./kjs/reference_list.cpp
+./kjs/function_object.cpp
+./kjs/date_object.cpp
+./kjs/regexp.cpp
+./kjs/regexp_object.cpp
+./kjs/debugger.cpp
+./kjs/identifier.cpp
+./kjs/lookup.cpp
+./kjs/collector.cpp
+./kjs/operations.cpp
+./kjs/interpreter.cpp
+./kjs/function.cpp
+./kjs/nodes.cpp
+./kjs/scope_chain.cpp
+./kjs/number_object.cpp
+./kjs/math_object.cpp
+./kjs/array_object.cpp
+./kjs/reference.cpp
+./kjs/error_object.cpp
+./kjs/testkjs.cpp
+./kjs/lexer.cpp
+./kjs/ustring.cpp
+./kjs/grammar.cpp
+./pics/ksvgtopng.cpp
+./kdesu/process.cpp
+./kdesu/stub.cpp
+./kdesu/kdesu_pty.cpp
+./kdesu/kcookie.cpp
+./kdesu/ssh.cpp
+./kdesu/su.cpp
+./kdesu/client.cpp
+./kconf_update/kconf_update.cpp
+./kinit/kioslave.cpp
+./kinit/setproctitle.cpp
+./kinit/klauncher_main.cpp
+./kinit/kstartupconfig.cpp
+./kinit/klauncher.cpp
+./kinit/kdostartupconfig.cpp
+./kinit/kinit.cpp
+./kinit/autostart.cpp
+./win/dummy.cpp
+./win/win32_utils2.cpp
+./win/bootstrap.cpp
+./win/qeventloopex.cpp
+./kded/kded.cpp
+./kded/vfolder_menu.cpp
+./kded/kctimefactory.cpp
+./kded/kde-menu.cpp
+./kded/kbuildsycoca.cpp
+./kded/kbuildservicetypefactory.cpp
+./kded/kbuildservicegroupfactory.cpp
+./kded/kbuildimageiofactory.cpp
+./kded/khostname.cpp
+./kded/kbuildservicefactory.cpp
+./kded/kdedmodule.cpp
+./kded/kbuildprotocolinfofactory.cpp
+./kded/test/test.cpp
+./kimgio/xview.cpp
+./kimgio/exr.cpp
+./kimgio/pcx.cpp
+./kimgio/eps.cpp
+./kimgio/psd.cpp
+./kimgio/dds.cpp
+./kimgio/xcf.cpp
+./kimgio/rgb.cpp
+./kimgio/tga.cpp
+./kimgio/tiffr.cpp
+./kimgio/ico.cpp
+./kimgio/hdr.cpp
+./kimgio/jp2.cpp
+./kimgio/g3r.cpp
+./kdecore/kkeyserver_x11.cpp
+./kdecore/ksocks.cpp
+./kdecore/kcompletionbase.cpp
+./kdecore/kcatalogue.cpp
+./kdecore/kqiodevicegzip_p.cpp
+./kdecore/kapplication.cpp
+./kdecore/kapplication_win.cpp
+./kdecore/kkeynative_x11.cpp
+./kdecore/kshortcut.cpp
+./kdecore/kiconloader.cpp
+./kdecore/ksimpleconfig.cpp
+./kdecore/kbufferedio.cpp
+./kdecore/netsupp.cpp
+./kdecore/kmacroexpander.cpp
+./kdecore/ksock.cpp
+./kdecore/kcalendarsystemjalali.cpp
+./kdecore/kpty.cpp
+./kdecore/kconfigskeleton.cpp
+./kdecore/netwm.cpp
+./kdecore/kprotocolinfo_kdecore.cpp
+./kdecore/kclipboard.cpp
+./kdecore/kmountpoint.cpp
+./kdecore/kprocctrl.cpp
+./kdecore/kglobalaccel_x11.cpp
+./kdecore/kmdcodec.cpp
+./kdecore/kcalendarsystemgregorian.cpp
+./kdecore/kcheckaccelerators.cpp
+./kdecore/kcalendarsystemfactory.cpp
+./kdecore/kdcoppropertyproxy.cpp
+./kdecore/kappdcopiface.cpp
+./kdecore/kurldrag.cpp
+./kdecore/kipc.cpp
+./kdecore/klibloader.cpp
+./kdecore/kdesktopfile.cpp
+./kdecore/kmanagerselection.cpp
+./kdecore/kuser.cpp
+./kdecore/kglobalaccel_win.cpp
+./kdecore/kextsock.cpp
+./kdecore/kiconeffect.cpp
+./kdecore/kcmdlineargs.cpp
+./kdecore/kxerrorhandler.cpp
+./kdecore/kstringhandler.cpp
+./kdecore/kicontheme.cpp
+./kdecore/ksycocafactory.cpp
+./kdecore/kdebugdcopiface.cpp
+./kdecore/ksockaddr.cpp
+./kdecore/kaudioplayer.cpp
+./kdecore/kpalette.cpp
+./kdecore/kurl.cpp
+./kdecore/kconfigdialogmanager.cpp
+./kdecore/kinstance.cpp
+./kdecore/kstdaccel.cpp
+./kdecore/kstaticdeleter.cpp
+./kdecore/kcharsets.cpp
+./kdecore/ktimezones.cpp
+./kdecore/ksycocadict.cpp
+./kdecore/knotifyclient.cpp
+./kdecore/kshortcutmenu.cpp
+./kdecore/netsupp_win32.cpp
+./kdecore/kpixmapprovider.cpp
+./kdecore/kconfigbase.cpp
+./kdecore/ksycoca.cpp
+./kdecore/kcompletion.cpp
+./kdecore/kaccelaction.cpp
+./kdecore/kaccelbase.cpp
+./kdecore/ksavefile.cpp
+./kdecore/kxmessages.cpp
+./kdecore/kshortcutlist.cpp
+./kdecore/kallocator.cpp
+./kdecore/kdebug.cpp
+./kdecore/kuniqueapplication.cpp
+./kdecore/klocale.cpp
+./kdecore/libintl.cpp
+./kdecore/krandomsequence.cpp
+./kdecore/kstandarddirs.cpp
+./kdecore/kregexp.cpp
+./kdecore/kglobalsettings.cpp
+./kdecore/kconfigbackend.cpp
+./kdecore/kasyncio.cpp
+./kdecore/krfcdate.cpp
+./kdecore/kdeversion.cpp
+./kdecore/krootprop.cpp
+./kdecore/kcalendarsystem.cpp
+./kdecore/kwin.cpp
+./kdecore/kidna.cpp
+./kdecore/kwinmodule.cpp
+./kdecore/kshell.cpp
+./kdecore/ktempdir.cpp
+./kdecore/kcalendarsystemhijri.cpp
+./kdecore/kprocess.cpp
+./kdecore/kaboutdata.cpp
+./kdecore/kvmallocator.cpp
+./kdecore/kcalendarsystemhebrew.cpp
+./kdecore/kglobal.cpp
+./kdecore/kcrash.cpp
+./kdecore/kconfig.cpp
+./kdecore/kckey.cpp
+./kdecore/ktempfile.cpp
+./kdecore/klockfile.cpp
+./kdecore/kprotocolinfofactory.cpp
+./kdecore/kmimesourcefactory.cpp
+./kdecore/kglobalaccel.cpp
+./kdecore/kmultipledrag.cpp
+./kdecore/kstartupinfo.cpp
+./kdecore/kaccel.cpp
+./kdecore/kaccelmanager.cpp
+./kdecore/kprocio.cpp
+./kdecore/svgicons/ksvgiconpainter.cpp
+./kdecore/svgicons/ksvgiconengine.cpp
+./kdecore/network/kserversocket.cpp
+./kdecore/network/kresolverstandardworkers.cpp
+./kdecore/network/kreverseresolver.cpp
+./kdecore/network/kclientsocketbase.cpp
+./kdecore/network/ksocketaddress.cpp
+./kdecore/network/kresolverworkerbase.cpp
+./kdecore/network/ksrvresolverworker.cpp
+./kdecore/network/ksocketbase.cpp
+./kdecore/network/kresolvermanager.cpp
+./kdecore/network/kbufferedsocket.cpp
+./kdecore/network/kstreamsocket.cpp
+./kdecore/network/ksocketbuffer.cpp
+./kdecore/network/kdatagramsocket.cpp
+./kdecore/network/kresolver.cpp
+./kdecore/network/ksockssocketdevice.cpp
+./kdecore/network/ksocketdevice.cpp
+./kdecore/network/khttpproxysocketdevice.cpp
+./kdecore/kconfig_compiler/kconfig_compiler.cpp
+./kdewidgets/makekdewidgets.cpp
+./kdewidgets/classpreviews.cpp
+./dnssd/responder.cpp
+./dnssd/query.cpp
+./dnssd/servicebrowser.cpp
+./dnssd/remoteservice.cpp
+./dnssd/servicebase.cpp
+./dnssd/domainbrowser.cpp
+./dnssd/publicservice.cpp
+./interfaces/kscript/scriptloader.cpp
+./interfaces/kscript/scriptmanager.cpp
+./interfaces/kscript/sample/shellscript.cpp
+./interfaces/ktexteditor/undodcopinterface.cpp
+./interfaces/ktexteditor/clipboarddcopinterface.cpp
+./interfaces/ktexteditor/searchdcopinterface.cpp
+./interfaces/ktexteditor/sessionconfiginterface.cpp
+./interfaces/ktexteditor/variableinterface.cpp
+./interfaces/ktexteditor/encodingdcopinterface.cpp
+./interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+./interfaces/ktexteditor/documentinfo.cpp
+./interfaces/ktexteditor/searchinterface.cpp
+./interfaces/ktexteditor/dynwordwrapinterface.cpp
+./interfaces/ktexteditor/viewcursordcopinterface.cpp
+./interfaces/ktexteditor/editdcopinterface.cpp
+./interfaces/ktexteditor/templateinterface.cpp
+./interfaces/ktexteditor/markinterface.cpp
+./interfaces/ktexteditor/selectiondcopinterface.cpp
+./interfaces/ktexteditor/configinterface.cpp
+./interfaces/ktexteditor/clipboardinterface.cpp
+./interfaces/ktexteditor/viewcursorinterface.cpp
+./interfaces/ktexteditor/codecompletioninterface.cpp
+./interfaces/ktexteditor/selectioninterfaceext.cpp
+./interfaces/ktexteditor/blockselectioninterface.cpp
+./interfaces/ktexteditor/editinterface.cpp
+./interfaces/ktexteditor/ktexteditor.cpp
+./interfaces/ktexteditor/markinterfaceextension.cpp
+./interfaces/ktexteditor/documentdcopinfo.cpp
+./interfaces/ktexteditor/printinterface.cpp
+./interfaces/ktexteditor/cursorinterface.cpp
+./interfaces/ktexteditor/texthintinterface.cpp
+./interfaces/ktexteditor/configinterfaceextension.cpp
+./interfaces/ktexteditor/blockselectiondcopinterface.cpp
+./interfaces/ktexteditor/wordwrapinterface.cpp
+./interfaces/ktexteditor/editinterfaceext.cpp
+./interfaces/ktexteditor/selectioninterface.cpp
+./interfaces/ktexteditor/printdcopinterface.cpp
+./interfaces/ktexteditor/popupmenuinterface.cpp
+./interfaces/ktexteditor/editorchooser.cpp
+./interfaces/ktexteditor/undointerface.cpp
+./interfaces/ktexteditor/encodinginterface.cpp
+./interfaces/ktexteditor/highlightinginterface.cpp
+./interfaces/ktexteditor/viewstatusmsginterface.cpp
+./interfaces/kmediaplayer/player.cpp
+./interfaces/kmediaplayer/view.cpp
+./kstyles/kthemestyle/kstyledirs.cpp
+./kstyles/kthemestyle/kthemestyle.cpp
+./kstyles/kthemestyle/kthemebase.cpp
+./kstyles/web/plugin.cpp
+./kstyles/web/webstyle.cpp
+./kstyles/highcontrast/highcontrast.cpp
+./kstyles/keramik/pixmaploader.cpp
+./kstyles/keramik/colorutil.cpp
+./kstyles/keramik/genembed.cpp
+./kstyles/keramik/keramik.cpp
+./kstyles/keramik/gradients.cpp
+./kstyles/klegacy/plugin.cpp
+./kstyles/klegacy/klegacystyle.cpp
+./kstyles/highcolor/highcolor.cpp
+./kstyles/light/light.cpp
+./kstyles/light/lightstyle-v2.cpp
+./kstyles/light/lightstyle-v3.cpp
+./kstyles/utils/installtheme/main.cpp
+./kstyles/plastik/plastik.cpp
+./kstyles/plastik/misc.cpp
+./obj-i486-linux-gnu/kjs/libkjs_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/dummy.cpp
+./obj-i486-linux-gnu/kio/misc/libkdeinit_kio_uiserver_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/misc/observer_stub.cpp
+./obj-i486-linux-gnu/kio/misc/uiserver_skel.cpp
+./obj-i486-linux-gnu/kio/misc/kio_uiserver.la.cpp
+./obj-i486-linux-gnu/kio/misc/kio_uiserver_dummy.cpp
+./obj-i486-linux-gnu/kio/misc/kntlm/libkntlm_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/misc/kssld/kded_kssld_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/misc/kssld/kssld_skel.cpp
+./obj-i486-linux-gnu/kio/misc/kpac/proxyscout_skel.cpp
+./obj-i486-linux-gnu/kio/misc/kpac/kded_proxyscout_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/misc/ksendbugmail/ksendbugmail.all_cpp.cpp
+./obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp
+./obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp
+./obj-i486-linux-gnu/kio/misc/kwalletd/kwalletd_skel.cpp
+./obj-i486-linux-gnu/kio/misc/kwalletd/kded_kwalletd_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/kio/observer_skel.cpp
+./obj-i486-linux-gnu/kio/kio/observer_stub.cpp
+./obj-i486-linux-gnu/kio/kio/kdirnotify_skel.cpp
+./obj-i486-linux-gnu/kio/kio/libkiocore_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/kio/libksycoca_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/kio/uiserver_stub.cpp
+./obj-i486-linux-gnu/kio/kpasswdserver/kded_kpasswdserver_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/kpasswdserver/kpasswdserver_skel.cpp
+./obj-i486-linux-gnu/kio/kfile/libkfile_la.all_cpp.cpp
+./obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp
+./obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp
+./obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp
+./obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.cpp
+./obj-i486-linux-gnu/kdesu/libkdesu_la.all_cpp.cpp
+./obj-i486-linux-gnu/kconf_update/kconf_update.la.cpp
+./obj-i486-linux-gnu/kconf_update/kconf_update_dummy.cpp
+./obj-i486-linux-gnu/kinit/libkdeinit_klauncher_la.all_cpp.cpp
+./obj-i486-linux-gnu/kinit/klauncher.la.cpp
+./obj-i486-linux-gnu/kinit/kdeinit.all_cpp.cpp
+./obj-i486-linux-gnu/kinit/klauncher_dummy.cpp
+./obj-i486-linux-gnu/kded/libkdeinit_kded_la.all_cpp.cpp
+./obj-i486-linux-gnu/kded/kded_dummy.cpp
+./obj-i486-linux-gnu/kded/kded.la.cpp
+./obj-i486-linux-gnu/kded/libkdeinit_kbuildsycoca_la.all_cpp.cpp
+./obj-i486-linux-gnu/kded/kbuildsycoca_dummy.cpp
+./obj-i486-linux-gnu/kded/kbuildsycoca.la.cpp
+./obj-i486-linux-gnu/kdeprint/kmfactory_skel.cpp
+./obj-i486-linux-gnu/kdeprint/kdeprintd_skel.cpp
+./obj-i486-linux-gnu/kdeprint/rlpr/kdeprint_rlpr_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/cups/kdeprint_cups_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/cups/cupsdconf2/cupsdconf_dummy.cpp
+./obj-i486-linux-gnu/kdeprint/cups/cupsdconf2/libkdeinit_cupsdconf_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/cups/cupsdconf2/cupsdconf.la.cpp
+./obj-i486-linux-gnu/kdeprint/ext/kdeprint_ext_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/lpdunix/kdeprint_lpdunix_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/lpr/kdeprint_lpr_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/management/libkdeprint_management_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeprint/management/kaddprinterwizard.la.cpp
+./obj-i486-linux-gnu/kdeprint/management/kaddprinterwizard_dummy.cpp
+./obj-i486-linux-gnu/kdecore/kdebugdcopiface_skel.cpp
+./obj-i486-linux-gnu/kdecore/ksycoca_skel.cpp
+./obj-i486-linux-gnu/kdecore/kappdcopiface_skel.cpp
+./obj-i486-linux-gnu/kdecore/libkdecore_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdecore/kde-config.cpp
+./obj-i486-linux-gnu/kdecore/svgicons/libkdesvgicons_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdecore/network/libkdecorenetwork_la.all_cpp.cpp
+./obj-i486-linux-gnu/kcmshell/libkdeinit_kcmshell_la.all_cpp.cpp
+./obj-i486-linux-gnu/kcmshell/kcmshell.la.cpp
+./obj-i486-linux-gnu/kcmshell/main_skel.cpp
+./obj-i486-linux-gnu/kcmshell/kcmshell_dummy.cpp
+./obj-i486-linux-gnu/kate/part/dummy.cpp
+./obj-i486-linux-gnu/kate/part/libkate_la.all_cpp.cpp
+./obj-i486-linux-gnu/kate/part/katedocument_skel.cpp
+./obj-i486-linux-gnu/kate/interfaces/libkatepartinterfaces_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdewidgets/kdewidgets_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdewidgets/kdewidgets.cpp
+./obj-i486-linux-gnu/dnssd/libkdnssd_la.all_cpp.cpp
+./obj-i486-linux-gnu/dnssd/settings.cpp
+./obj-i486-linux-gnu/kioslave/http/kcookiejar/kcookiejar_dummy.cpp
+./obj-i486-linux-gnu/kioslave/http/kcookiejar/kcookiejar.la.cpp
+./obj-i486-linux-gnu/kioslave/http/kcookiejar/kcookieserver_skel.cpp
+./obj-i486-linux-gnu/kioslave/http/kcookiejar/kded_kcookiejar_la.all_cpp.cpp
+./obj-i486-linux-gnu/interfaces/kscript/scriptclientinterface.moc.cpp
+./obj-i486-linux-gnu/interfaces/kscript/libkscript_la.all_cpp.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/documentdcopinfo_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/editdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/libktexteditor_la.all_cpp.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/selectiondcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/undodcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/clipboarddcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/selectionextdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/printdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/searchdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/viewstatusmsgdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/encodingdcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/blockselectiondcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/ktexteditor/viewcursordcopinterface_skel.cpp
+./obj-i486-linux-gnu/interfaces/kmediaplayer/libkmediaplayer_la.all_cpp.cpp
+./obj-i486-linux-gnu/interfaces/kmediaplayer/playerdcopobject_skel.cpp
+./obj-i486-linux-gnu/interfaces/kimproxy/library/libkimproxy_la.all_cpp.cpp
+./obj-i486-linux-gnu/interfaces/kimproxy/library/kimproxyiface_skel.cpp
+./obj-i486-linux-gnu/interfaces/kimproxy/library/kimiface_stub.cpp
+./obj-i486-linux-gnu/kstyles/kthemestyle/kthemestyle_la.all_cpp.cpp
+./obj-i486-linux-gnu/kstyles/keramik/keramik_la.all_cpp.cpp
+./obj-i486-linux-gnu/kstyles/light/light_la.all_cpp.cpp
+./obj-i486-linux-gnu/kstyles/plastik/plastik_la.all_cpp.cpp
+./obj-i486-linux-gnu/kutils/kcmoduleproxyIface_skel.cpp
+./obj-i486-linux-gnu/kutils/libkutils_la.all_cpp.cpp
+./obj-i486-linux-gnu/kutils/ksettings/libksettings_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeui/dummy.cpp
+./obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.cpp
+./obj-i486-linux-gnu/kdeui/kmainwindowiface_skel.cpp
+./obj-i486-linux-gnu/kdeui/libkdeui_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdeui/kspellui.cpp
+./obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.cpp
+./obj-i486-linux-gnu/kdeui/kdetrayproxy/module_skel.cpp
+./obj-i486-linux-gnu/kdeui/kdetrayproxy/kded_kdetrayproxy_la.all_cpp.cpp
+./obj-i486-linux-gnu/kspell2/libkspell2base_la.all_cpp.cpp
+./obj-i486-linux-gnu/kspell2/ui/configui.cpp
+./obj-i486-linux-gnu/kspell2/ui/libkspell2_noinst_la.all_cpp.cpp
+./obj-i486-linux-gnu/kspell2/ui/kspell2ui.cpp
+./obj-i486-linux-gnu/kspell2/plugins/hspell/kspell_hspell_la.all_cpp.cpp
+./obj-i486-linux-gnu/kspell2/plugins/ispell/kspell_ispell_la.all_cpp.cpp
+./obj-i486-linux-gnu/kspell2/plugins/aspell/kspell_aspell_la.all_cpp.cpp
+./obj-i486-linux-gnu/libkscreensaver/libkscreensaver_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/dummy.cpp
+./obj-i486-linux-gnu/khtml/imgdummy.cpp
+./obj-i486-linux-gnu/khtml/libkhtml_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/misc/libkhtmlmisc_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/dom/libkhtmldom_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/css/libkhtmlcss_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/ecma/libkjs_html_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/xml/libkhtmlxml_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/rendering/libkhtmlrender_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/html/libkhtmlhtml_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/java/libkjava_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/java/kjavaappletviewer_la.all_cpp.cpp
+./obj-i486-linux-gnu/khtml/java/dummy/dummy.cpp
+./obj-i486-linux-gnu/kdoctools/kio_ghelp_la.all_cpp.cpp
+./obj-i486-linux-gnu/kdoctools/kbzip2filter.cpp
+./obj-i486-linux-gnu/kdoctools/xslt_pure.cpp
+./obj-i486-linux-gnu/kdoctools/kio_help_la.all_cpp.cpp
+./obj-i486-linux-gnu/kresources/libkresources_la.all_cpp.cpp
+./obj-i486-linux-gnu/kresources/manageriface_skel.cpp
+./obj-i486-linux-gnu/kresources/manageriface_stub.cpp
+./obj-i486-linux-gnu/dcop/dcopserver_dummy.cpp
+./obj-i486-linux-gnu/dcop/dcopserver.la.cpp
+./obj-i486-linux-gnu/dcop/libkdeinit_dcopserver_la.all_cpp.cpp
+./obj-i486-linux-gnu/dcop/libDCOP_la.all_cpp.cpp
+./obj-i486-linux-gnu/dcop/dcopidl2cpp/dcopidl2cpp.all_cpp.cpp
+./obj-i486-linux-gnu/kmdi/libkmdi_la.all_cpp.cpp
+./obj-i486-linux-gnu/kmdi/kmdi/libkmdi2_la.all_cpp.cpp
+./obj-i486-linux-gnu/arts/knotify/knotify_la.all_cpp.cpp
+./obj-i486-linux-gnu/arts/knotify/knotify_skel.cpp
+./obj-i486-linux-gnu/kdefx/libkdefx_la.all_cpp.cpp
+./obj-i486-linux-gnu/kabc/addresseehelper_skel.cpp
+./obj-i486-linux-gnu/kabc/libkabc_la.all_cpp.cpp
+./obj-i486-linux-gnu/kabc/vcardparser/libvcards_la.all_cpp.cpp
+./obj-i486-linux-gnu/kabc/plugins/ldapkio/libkabc_ldapkio_la.all_cpp.cpp
+./obj-i486-linux-gnu/kabc/plugins/dir/libkabc_dir_la.all_cpp.cpp
+./obj-i486-linux-gnu/kabc/plugins/file/libkabc_file_la.all_cpp.cpp
+./obj-i486-linux-gnu/knewstuff/libknewstuff_la.all_cpp.cpp
+./obj-i486-linux-gnu/kunittest/libkunittest_la.all_cpp.cpp
+./obj-i486-linux-gnu/kparts/libkparts_la.all_cpp.cpp
+./kutils/kcmoduleloader.cpp
+./kutils/kfinddialog.cpp
+./kutils/kreplace.cpp
+./kutils/kcmoduleproxyIfaceImpl.cpp
+./kutils/kcmoduleinfo.cpp
+./kutils/kpluginselector.cpp
+./kutils/kfind.cpp
+./kutils/kcmodulecontainer.cpp
+./kutils/kreplacedialog.cpp
+./kutils/kcmultidialog.cpp
+./kutils/kcmoduleproxy.cpp
+./kutils/kmultitabbar.cpp
+./kutils/kplugininfo.cpp
+./kutils/ksettings/dispatcher.cpp
+./kutils/ksettings/pluginpage.cpp
+./kutils/ksettings/dialog.cpp
+./kutils/ksettings/componentsdialog.cpp
+./kdeui/kshortcutdialog.cpp
+./kdeui/kdialogbase.cpp
+./kdeui/klistview.cpp
+./kdeui/krestrictedline.cpp
+./kdeui/kseparator.cpp
+./kdeui/kdatetimewidget.cpp
+./kdeui/ktoolbarradiogroup.cpp
+./kdeui/qxembed.cpp
+./kdeui/ktimezonewidget.cpp
+./kdeui/kaboutapplication.cpp
+./kdeui/kpassdlg.cpp
+./kdeui/kdockwidget_private.cpp
+./kdeui/kscrollview.cpp
+./kdeui/ktoolbarhandler.cpp
+./kdeui/kpanelmenu.cpp
+./kdeui/kstdguiitem.cpp
+./kdeui/kmainwindowiface.cpp
+./kdeui/kdualcolorbutton.cpp
+./kdeui/kcolorbutton.cpp
+./kdeui/kxmlguifactory_p.cpp
+./kdeui/kmessagebox.cpp
+./kdeui/ktoolbar.cpp
+./kdeui/kcharselect.cpp
+./kdeui/kbugreport.cpp
+./kdeui/ksplashscreen.cpp
+./kdeui/kxmlguibuilder.cpp
+./kdeui/kactivelabel.cpp
+./kdeui/kaboutdialog.cpp
+./kdeui/klistbox.cpp
+./kdeui/kaboutkde.cpp
+./kdeui/kmainwindow.cpp
+./kdeui/ktimewidget.cpp
+./kdeui/kfontdialog.cpp
+./kdeui/kmenubar.cpp
+./kdeui/ksconfig.cpp
+./kdeui/kaction.cpp
+./kdeui/kinputdialog.cpp
+./kdeui/kxmlguiclient.cpp
+./kdeui/kdatetbl.cpp
+./kdeui/kdcopactionproxy.cpp
+./kdeui/kruler.cpp
+./kdeui/kcolorcombo.cpp
+./kdeui/ktip.cpp
+./kdeui/kcmenumngr.cpp
+./kdeui/kprogress.cpp
+./kdeui/kpanelapplet.cpp
+./kdeui/klanguagebutton.cpp
+./kdeui/kbuttonbox.cpp
+./kdeui/kkeybutton.cpp
+./kdeui/keditcl2.cpp
+./kdeui/kactionclasses.cpp
+./kdeui/kpopupmenu.cpp
+./kdeui/kdatepicker.cpp
+./kdeui/kkeydialog.cpp
+./kdeui/kcompletionbox.cpp
+./kdeui/kpassivepopup.cpp
+./kdeui/knuminput.cpp
+./kdeui/kpixmapregionselectorwidget.cpp
+./kdeui/kspelldlg.cpp
+./kdeui/kdialog.cpp
+./kdeui/kurllabel.cpp
+./kdeui/keditlistbox.cpp
+./kdeui/kxmlguifactory.cpp
+./kdeui/kguiitem.cpp
+./kdeui/ksqueezedtextlabel.cpp
+./kdeui/khelpmenu.cpp
+./kdeui/kled.cpp
+./kdeui/ktextbrowser.cpp
+./kdeui/kstdaction.cpp
+./kdeui/ksyntaxhighlighter.cpp
+./kdeui/kcommand.cpp
+./kdeui/kselect.cpp
+./kdeui/kpanelappmenu.cpp
+./kdeui/kwindowlistmenu.cpp
+./kdeui/kconfigdialog.cpp
+./kdeui/kcmodule.cpp
+./kdeui/kfontrequester.cpp
+./kdeui/kspell.cpp
+./kdeui/klistviewsearchline.cpp
+./kdeui/klineedit.cpp
+./kdeui/ksystemtray.cpp
+./kdeui/kcolordialog.cpp
+./kdeui/kedittoolbar.cpp
+./kdeui/kwordwrap.cpp
+./kdeui/kpanelextension.cpp
+./kdeui/kdockwidget.cpp
+./kdeui/kactionselector.cpp
+./kdeui/kauthicon.cpp
+./kdeui/kpixmapregionselectordialog.cpp
+./kdeui/kwizard.cpp
+./kdeui/kpixmapio.cpp
+./kdeui/ksharedpixmap.cpp
+./kdeui/kcursor.cpp
+./kdeui/ktabbar.cpp
+./kdeui/ktoolbarbutton.cpp
+./kdeui/knumvalidator.cpp
+./kdeui/ktabctl.cpp
+./kdeui/kiconviewsearchline.cpp
+./kdeui/kswitchlanguagedialog.cpp
+./kdeui/karrowbutton.cpp
+./kdeui/keditcl1.cpp
+./kdeui/krootpixmap.cpp
+./kdeui/kcolordrag.cpp
+./kdeui/kpushbutton.cpp
+./kdeui/ktextedit.cpp
+./kdeui/kwhatsthismanager.cpp
+./kdeui/kdatewidget.cpp
+./kdeui/kjanuswidget.cpp
+./kdeui/kfontcombo.cpp
+./kdeui/kiconview.cpp
+./kdeui/klineeditdlg.cpp
+./kdeui/kanimwidget.cpp
+./kdeui/ktabwidget.cpp
+./kdeui/ktoolbarlabelaction.cpp
+./kdeui/kcombobox.cpp
+./kdeui/kstringvalidator.cpp
+./kdeui/kwindowinfo.cpp
+./kdeui/kactioncollection.cpp
+./kdeui/kstatusbar.cpp
+./kdeui/kdetrayproxy/kdetrayproxy.cpp
+./kdeui/kdetrayproxy/module.cpp
+./kspell2/broker.cpp
+./kspell2/defaultdictionary.cpp
+./kspell2/client.cpp
+./kspell2/backgroundthread.cpp
+./kspell2/settings.cpp
+./kspell2/filter.cpp
+./kspell2/backgroundengine.cpp
+./kspell2/backgroundchecker.cpp
+./kspell2/ui/highlighter.cpp
+./kspell2/ui/configdialog.cpp
+./kspell2/ui/configwidget.cpp
+./kspell2/ui/dialog.cpp
+./kspell2/plugins/hspell/kspell_hspellclient.cpp
+./kspell2/plugins/hspell/kspell_hspelldict.cpp
+./kspell2/plugins/ispell/correct.cpp
+./kspell2/plugins/ispell/ispell_checker.cpp
+./kspell2/plugins/ispell/tgood.cpp
+./kspell2/plugins/ispell/lookup.cpp
+./kspell2/plugins/ispell/kspell_ispellclient.cpp
+./kspell2/plugins/ispell/good.cpp
+./kspell2/plugins/ispell/kspell_ispelldict.cpp
+./kspell2/plugins/ispell/hash.cpp
+./kspell2/plugins/ispell/makedent.cpp
+./kspell2/plugins/aspell/kspell_aspellclient.cpp
+./kspell2/plugins/aspell/kspell_aspelldict.cpp
+./khtml/khtmlview.cpp
+./khtml/khtml_events.cpp
+./khtml/khtml_pagecache.cpp
+./khtml/domtreeview.cpp
+./khtml/khtml_caret.cpp
+./khtml/test_regression.cpp
+./khtml/khtml_ext.cpp
+./khtml/test_regression_fontoverload.cpp
+./khtml/khtml_part.cpp
+./khtml/testkhtml.cpp
+./khtml/khtmlimage.cpp
+./khtml/khtml_printsettings.cpp
+./khtml/khtml_run.cpp
+./khtml/khtml_factory.cpp
+./khtml/misc/loader_jpeg.cpp
+./khtml/misc/stringit.cpp
+./khtml/misc/decoder.cpp
+./khtml/misc/loader.cpp
+./khtml/misc/arena.cpp
+./khtml/misc/helper.cpp
+./khtml/misc/guess_ja.cpp
+./khtml/misc/blocked_icon.cpp
+./khtml/misc/knsplugininstaller.cpp
+./khtml/misc/htmlhashes.cpp
+./khtml/kmultipart/kmultipart.cpp
+./khtml/dom/html_element.cpp
+./khtml/dom/html_table.cpp
+./khtml/dom/html_object.cpp
+./khtml/dom/dom_node.cpp
+./khtml/dom/html_head.cpp
+./khtml/dom/dom2_traversal.cpp
+./khtml/dom/html_list.cpp
+./khtml/dom/html_form.cpp
+./khtml/dom/dom_xml.cpp
+./khtml/dom/css_value.cpp
+./khtml/dom/css_rule.cpp
+./khtml/dom/css_stylesheet.cpp
+./khtml/dom/css_extensions.cpp
+./khtml/dom/dom2_range.cpp
+./khtml/dom/dom_doc.cpp
+./khtml/dom/dom2_events.cpp
+./khtml/dom/dom2_views.cpp
+./khtml/dom/dom_misc.cpp
+./khtml/dom/html_document.cpp
+./khtml/dom/dom_element.cpp
+./khtml/dom/html_inline.cpp
+./khtml/dom/html_misc.cpp
+./khtml/dom/html_block.cpp
+./khtml/dom/html_image.cpp
+./khtml/dom/dom_text.cpp
+./khtml/dom/html_base.cpp
+./khtml/dom/dom_string.cpp
+./khtml/css/parser.cpp
+./khtml/css/css_valueimpl.cpp
+./khtml/css/css_base.cpp
+./khtml/css/css_stylesheetimpl.cpp
+./khtml/css/cssstyleselector.cpp
+./khtml/css/tokenizer.cpp
+./khtml/css/css_extensionsimpl.cpp
+./khtml/css/cssparser.cpp
+./khtml/css/css_renderstyledeclarationimpl.cpp
+./khtml/css/csshelper.cpp
+./khtml/css/css_ruleimpl.cpp
+./khtml/ecma/testecma.cpp
+./khtml/ecma/xmlhttprequest.cpp
+./khtml/ecma/domparser.cpp
+./khtml/ecma/xmlserializer.cpp
+./khtml/ecma/kjs_navigator.cpp
+./khtml/ecma/kjs_html.cpp
+./khtml/ecma/kjs_traversal.cpp
+./khtml/ecma/kjs_proxy.cpp
+./khtml/ecma/kjs_events.cpp
+./khtml/ecma/kjs_debugwin.cpp
+./khtml/ecma/kjs_css.cpp
+./khtml/ecma/kjs_mozilla.cpp
+./khtml/ecma/kjs_dom.cpp
+./khtml/ecma/kjs_views.cpp
+./khtml/ecma/kjs_binding.cpp
+./khtml/ecma/kjs_window.cpp
+./khtml/ecma/kjs_range.cpp
+./khtml/xml/xml_tokenizer.cpp
+./khtml/xml/dom_textimpl.cpp
+./khtml/xml/dom_restyler.cpp
+./khtml/xml/dom_docimpl.cpp
+./khtml/xml/dom_xmlimpl.cpp
+./khtml/xml/dom_stringimpl.cpp
+./khtml/xml/dom2_traversalimpl.cpp
+./khtml/xml/dom2_eventsimpl.cpp
+./khtml/xml/dom_elementimpl.cpp
+./khtml/xml/dom2_rangeimpl.cpp
+./khtml/xml/dom_nodeimpl.cpp
+./khtml/xml/dom2_viewsimpl.cpp
+./khtml/rendering/render_br.cpp
+./khtml/rendering/render_applet.cpp
+./khtml/rendering/render_layer.cpp
+./khtml/rendering/render_arena.cpp
+./khtml/rendering/render_table.cpp
+./khtml/rendering/bidi.cpp
+./khtml/rendering/render_text.cpp
+./khtml/rendering/render_generated.cpp
+./khtml/rendering/render_container.cpp
+./khtml/rendering/counter_tree.cpp
+./khtml/rendering/render_flow.cpp
+./khtml/rendering/render_block.cpp
+./khtml/rendering/render_box.cpp
+./khtml/rendering/render_image.cpp
+./khtml/rendering/render_list.cpp
+./khtml/rendering/render_inline.cpp
+./khtml/rendering/enumerate.cpp
+./khtml/rendering/font.cpp
+./khtml/rendering/render_object.cpp
+./khtml/rendering/render_style.cpp
+./khtml/rendering/break_lines.cpp
+./khtml/rendering/render_canvas.cpp
+./khtml/rendering/loading_icon.cpp
+./khtml/rendering/render_form.cpp
+./khtml/rendering/table_layout.cpp
+./khtml/rendering/render_frames.cpp
+./khtml/rendering/render_line.cpp
+./khtml/rendering/render_replaced.cpp
+./khtml/rendering/render_body.cpp
+./khtml/html/html_objectimpl.cpp
+./khtml/html/doctypes.cpp
+./khtml/html/html_miscimpl.cpp
+./khtml/html/dtd.cpp
+./khtml/html/html_formimpl.cpp
+./khtml/html/htmlparser.cpp
+./khtml/html/htmltokenizer.cpp
+./khtml/html/html_headimpl.cpp
+./khtml/html/html_inlineimpl.cpp
+./khtml/html/html_blockimpl.cpp
+./khtml/html/html_elementimpl.cpp
+./khtml/html/html_baseimpl.cpp
+./khtml/html/html_tableimpl.cpp
+./khtml/html/html_imageimpl.cpp
+./khtml/html/html_listimpl.cpp
+./khtml/html/html_documentimpl.cpp
+./khtml/java/kjavaappletcontext.cpp
+./khtml/java/kjavaappletserver.cpp
+./khtml/java/kjavadownloader.cpp
+./khtml/java/kjavaappletviewer.cpp
+./khtml/java/kxeventutil.cpp
+./khtml/java/kjavaprocess.cpp
+./khtml/java/kqeventutil.cpp
+./khtml/java/kjavaapplet.cpp
+./khtml/java/kjavaappletwidget.cpp
+./kresources/factory.cpp
+./kresources/configdialog.cpp
+./kresources/kcmkresources.cpp
+./kresources/selectdialog.cpp
+./kresources/resource.cpp
+./kresources/configwidget.cpp
+./kresources/testresources.cpp
+./kresources/configpage.cpp
+./kresources/managerimpl.cpp
+./dcop/dcop_deadlock_test.cpp
+./dcop/dcopserver_win.cpp
+./dcop/dcopsignals.cpp
+./dcop/dcopclient.cpp
+./dcop/testdcop.cpp
+./dcop/dcopserver_shutdown_win.cpp
+./dcop/dcopref.cpp
+./dcop/dcopobject.cpp
+./dcop/dcopserver.cpp
+./dcop/dcopstub.cpp
+./dcop/client/dcop.cpp
+./dcop/client/dcopquit.cpp
+./dcop/client/dcopfind.cpp
+./dcop/client/dcopstart.cpp
+./dcop/client/marshall.cpp
+./dcop/dcopidl2cpp/stubimpl.cpp
+./dcop/dcopidl2cpp/stub.cpp
+./dcop/dcopidl2cpp/skel.cpp
+./dcop/dcopidl2cpp/main.cpp
+./dcop/KDE-ICE/ICE-def.cpp
+./dcop/dcopidl/main.cpp
+./kmdi/kmdifocuslist.cpp
+./kmdi/kmdichildview.cpp
+./kmdi/kmdichildfrm.cpp
+./kmdi/kmdimainfrm.cpp
+./kmdi/kmditaskbar.cpp
+./kmdi/kmdichildarea.cpp
+./kmdi/kmdiguiclient.cpp
+./kmdi/kmdidockcontainer.cpp
+./kmdi/kmdichildfrmcaption.cpp
+./kmdi/kmdidocumentviewtabwidget.cpp
+./kmdi/kmditoolviewaccessor.cpp
+./kmdi/test/hello.cpp
+./kmdi/test/main.cpp
+./kmdi/test/mainwidget.cpp
+./kmdi/kmdi/mainwindow.cpp
+./kmdi/kmdi/toolviewaccessor.cpp
+./kmdi/kmdi/tabwidget.cpp
+./kmdi/kmdi/guiclient.cpp
+./kmdi/kmdi/dockcontainer.cpp
+./arts/kde/kaudiorecordstream.cpp
+./arts/kde/kioinputstream_impl.cpp
+./arts/kde/kvideowidget.cpp
+./arts/kde/kartsserver.cpp
+./arts/kde/kartsfloatwatch.cpp
+./arts/kde/kaudiomanagerplay.cpp
+./arts/kde/kdatarequest_impl.cpp
+./arts/kde/kaudioplaystream.cpp
+./kdefx/kpixmapsplitter.cpp
+./kdefx/kcpuinfo.cpp
+./kdefx/kstyle.cpp
+./kdefx/kpixmap.cpp
+./kdefx/kdrawutil.cpp
+./kdefx/kimageeffect.cpp
+./kdefx/kpixmapeffect.cpp
+./kabc/ldif.cpp
+./kabc/vcardformatimpl.cpp
+./kabc/picture.cpp
+./kabc/vcardformat.cpp
+./kabc/vcardformatplugin.cpp
+./kabc/ldapconfigwidget.cpp
+./kabc/addresslineedit.cpp
+./kabc/plugin.cpp
+./kabc/sortmode.cpp
+./kabc/errorhandler.cpp
+./kabc/distributionlisteditor.cpp
+./kabc/resourceselectdialog.cpp
+./kabc/address.cpp
+./kabc/vcardconverter.cpp
+./kabc/addressbook.cpp
+./kabc/agent.cpp
+./kabc/phonenumber.cpp
+./kabc/vcardtool.cpp
+./kabc/field.cpp
+./kabc/ldifconverter.cpp
+./kabc/addresseehelper.cpp
+./kabc/distributionlistdialog.cpp
+./kabc/addressee.cpp
+./kabc/locknull.cpp
+./kabc/resource.cpp
+./kabc/addresseedialog.cpp
+./kabc/addresseelist.cpp
+./kabc/sound.cpp
+./kabc/geo.cpp
+./kabc/distributionlist.cpp
+./kabc/formatfactory.cpp
+./kabc/kab2kabc.cpp
+./kabc/ldapclient.cpp
+./kabc/vcard21parser.cpp
+./kabc/secrecy.cpp
+./kabc/timezone.cpp
+./kabc/stdaddressbook.cpp
+./kabc/ldapurl.cpp
+./kabc/key.cpp
+./kabc/lock.cpp
+./kabc/vcardparser/testread2.cpp
+./kabc/vcardparser/vcardline.cpp
+./kabc/vcardparser/vcardparser.cpp
+./kabc/vcardparser/testread.cpp
+./kabc/vcardparser/testutils.cpp
+./kabc/vcardparser/testwrite.cpp
+./kabc/vcardparser/vcard.cpp
+./kabc/scripts/addressee.src.cpp
+./kabc/scripts/field.src.cpp
+./kabc/vcard/ContentLine.cpp
+./kabc/vcard/ImgValue.cpp
+./kabc/vcard/AgentValue.cpp
+./kabc/vcard/TelValue.cpp
+./kabc/vcard/TextValue.cpp
+./kabc/vcard/Entity.cpp
+./kabc/vcard/RToken.cpp
+./kabc/vcard/TextParam.cpp
+./kabc/vcard/TextBinValue.cpp
+./kabc/vcard/PhoneNumberValue.cpp
+./kabc/vcard/Value.cpp
+./kabc/vcard/ImageParam.cpp
+./kabc/vcard/Enum.cpp
+./kabc/vcard/TextListValue.cpp
+./kabc/vcard/testread.cpp
+./kabc/vcard/OrgValue.cpp
+./kabc/vcard/AdrValue.cpp
+./kabc/vcard/DateParam.cpp
+./kabc/vcard/DateValue.cpp
+./kabc/vcard/LangValue.cpp
+./kabc/vcard/GeoValue.cpp
+./kabc/vcard/EmailParam.cpp
+./kabc/vcard/SourceParam.cpp
+./kabc/vcard/ClassValue.cpp
+./kabc/vcard/vCard-all.cpp
+./kabc/vcard/URIValue.cpp
+./kabc/vcard/TextBinParam.cpp
+./kabc/vcard/VCard.cpp
+./kabc/vcard/VCardEntity.cpp
+./kabc/vcard/AdrParam.cpp
+./kabc/vcard/ImageValue.cpp
+./kabc/vcard/Param.cpp
+./kabc/vcard/UTCValue.cpp
+./kabc/vcard/testwrite.cpp
+./kabc/vcard/AgentParam.cpp
+./kabc/vcard/TelParam.cpp
+./kabc/vcard/FloatValue.cpp
+./kabc/vcard/SoundValue.cpp
+./kabc/vcard/NValue.cpp
+./knewstuff/downloaddialog.cpp
+./knewstuff/knewstuffgeneric.cpp
+./knewstuff/ghns.cpp
+./knewstuff/entry.cpp
+./knewstuff/knewstuffsecure.cpp
+./knewstuff/knewstuffbutton.cpp
+./knewstuff/engine.cpp
+./knewstuff/testnewstuff.cpp
+./knewstuff/security.cpp
+./knewstuff/uploaddialog.cpp
+./knewstuff/provider.cpp
+./knewstuff/knewstuff.cpp
+./knewstuff/khotnewstuff.cpp
+./knewstuff/providerdialog.cpp
+./kunittest/modrunner.cpp
+./kunittest/samplemodule.cpp
+./kunittest/runner.cpp
+./kunittest/tester.cpp
+./kparts/factory.cpp
+./kparts/mainwindow.cpp
+./kparts/browserrun.cpp
+./kparts/event.cpp
+./kparts/historyprovider.cpp
+./kparts/statusbarextension.cpp
+./kparts/plugin.cpp
+./kparts/partmanager.cpp
+./kparts/browserextension.cpp
+./kparts/dockmainwindow.cpp
+./kparts/browserinterface.cpp
+./kparts/part.cpp
+./kcert/kcertpart.cc
+./kab/qconfigDB.cc
+./kab/addressbook.cc
+./kab/kabapi.cc
+./kwallet/client/kwallet.cc
+./kwallet/backend/blockcipher.cc
+./kwallet/backend/kwalletentry.cc
+./kwallet/backend/kwalletbackend.cc
+./kwallet/backend/cbc.cc
+./kwallet/backend/sha1.cc
+./kwallet/backend/blowfish.cc
+./interfaces/terminal/test/main.cc
+./obj-i486-linux-gnu/kio/kssl/libkssl_la.all_cc.cc
+./obj-i486-linux-gnu/kio/kssl/keygenwizard2.cc
+./obj-i486-linux-gnu/kio/kssl/keygenwizard.cc
+./obj-i486-linux-gnu/kio/bookmarks/kbookmarknotifier_skel.cc
+./obj-i486-linux-gnu/kio/bookmarks/kbookmarkmanager_skel.cc
+./obj-i486-linux-gnu/kio/bookmarks/libkbookmarks_la.all_cc.cc
+./obj-i486-linux-gnu/kab/libkab_la.all_cc.cc
+./obj-i486-linux-gnu/kwallet/client/kwallet_skel.cc
+./obj-i486-linux-gnu/kwallet/client/libkwalletclient_la.all_cc.cc
+./obj-i486-linux-gnu/kwallet/backend/libkwalletbackend_la.all_cc.cc
+./obj-i486-linux-gnu/kioslave/http/kio_http_cache_cleaner.la.cc
+./obj-i486-linux-gnu/kioslave/http/kio_http_cache_cleaner_dummy.cc
+./obj-i486-linux-gnu/khtml/htmlpageinfo.cc
+./obj-i486-linux-gnu/khtml/libkhtml_la.all_cc.cc
+./obj-i486-linux-gnu/khtml/kjserrordlg.cc
+./obj-i486-linux-gnu/khtml/khtml_iface_skel.cc
+./obj-i486-linux-gnu/dcop/dcopidl/dcopidl.all_cc.cc
+./obj-i486-linux-gnu/libkmid/libkmid_la.all_cc.cc
+./khtml/khtml_iface.cc
+./khtml/khtml_settings.cc
+./dcop/dcopidl/scanner.cc
+./dcop/dcopidl/yacc.cc
+./libkmid/fmout.cc
+./libkmid/midfile.cc
+./libkmid/alsaout.cc
+./libkmid/player.cc
+./libkmid/voiceman.cc
+./libkmid/track.cc
+./libkmid/gusout.cc
+./libkmid/synthout.cc
+./libkmid/deviceman.cc
+./libkmid/midistat.cc
+./libkmid/notearray.cc
+./libkmid/mt32togm.cc
+./libkmid/dattypes.cc
+./libkmid/libkmid.cc
+./libkmid/midimapper.cc
+./libkmid/midiout.cc
+./arts/kde/kplayobject.cc
+./arts/kde/kiotestslow.cc
+./arts/kde/kiotest.cc
+./arts/kde/kconverttest.cc
+./arts/kde/kplayobjectfactory.cc
+./arts/kde/kplayobjectcreator.cc
+./arts/kde/kaudioconverter.cc
+./arts/kde/kartsdispatcher.cc
+./arts/message/artsmessage.cc
+./kcert/kcertpart.h
+./kjs/completion.h
+./kjs/nodes.h
+./kjs/grammar.h
+./kjs/debugger.h
+./kjs/property_map.h
+./kjs/lexer.h
+./kjs/function.h
+./kjs/interpreter.h
+./kjs/string_object.h
+./kjs/object_object.h
+./kjs/simple_number.h
+./kjs/value.h
+./kjs/function_object.h
+./kjs/number_object.h
+./kjs/array_instance.h
+./kjs/types.h
+./kjs/object.h
+./kjs/error_object.h
+./kjs/dtoa.h
+./kjs/reference_list.h
+./kjs/array_object.h
+./kjs/ustring.h
+./kjs/identifier.h
+./kjs/math_object.h
+./kjs/operations.h
+./kjs/regexp_object.h
+./kjs/bool_object.h
+./kjs/collector.h
+./kjs/context.h
+./kjs/internal.h
+./kjs/regexp.h
+./kjs/scope_chain.h
+./kjs/list.h
+./kjs/reference.h
+./kjs/date_object.h
+./kjs/lookup.h
+./kdesu/kdesu_pty.h
+./kdesu/su.h
+./kdesu/stub.h
+./kdesu/defaults.h
+./kdesu/ssh.h
+./kdesu/client.h
+./kdesu/kcookie.h
+./kdesu/process.h
+./kinit/klauncher.h
+./kinit/setproctitle.h
+./kinit/autostart.h
+./kinit/klauncher_cmds.h
+./win/win32_utils.h
+./win/pwd.h
+./win/limits.h
+./win/signal.h
+./win/config.h
+./win/kdemacros.h
+./win/kdelibs_global_win.h
+./win/strings.h
+./win/qeventloopex.h
+./win/ctype.h
+./win/string.h
+./win/socket.h
+./win/in.h
+./win/fcntl.h
+./win/kdelibs_export_win.h
+./win/grp.h
+./win/utime.h
+./win/kde_file_win.h
+./win/syslog.h
+./win/stdlib.h
+./win/stdint.h
+./win/netdb.h
+./win/readdir.h
+./win/unistd.h
+./win/dirent.h
+./win/netinet/in.h
+./win/sys/times.h
+./win/sys/stat.h
+./win/sys/param.h
+./win/sys/un.h
+./win/sys/signal.h
+./win/sys/uio.h
+./win/sys/socket.h
+./win/sys/utsname.h
+./win/sys/types.h
+./win/sys/fcntl.h
+./win/sys/lock.h
+./win/sys/file.h
+./win/sys/wait.h
+./win/sys/mman.h
+./win/sys/resource.h
+./win/sys/time.h
+./win/asm/socket.h
+./win/asm/byteorder.h
+./win/machine/types.h
+./kded/kbuildservicegroupfactory.h
+./kded/kbuildsycoca.h
+./kded/kbuildimageiofactory.h
+./kded/kbuildservicefactory.h
+./kded/kbuildservicetypefactory.h
+./kded/vfolder_menu.h
+./kded/kbuildprotocolinfofactory.h
+./kded/kctimefactory.h
+./kded/kdedmodule.h
+./kded/kresourcelist.h
+./kded/kded.h
+./kded/test/test.h
+./kimgio/eps.h
+./kimgio/jp2.h
+./kimgio/dds.h
+./kimgio/hdr.h
+./kimgio/xview.h
+./kimgio/g3r.h
+./kimgio/psd.h
+./kimgio/tga.h
+./kimgio/ico.h
+./kimgio/gimp.h
+./kimgio/tiffr.h
+./kimgio/xcf.h
+./kimgio/exr.h
+./kimgio/rgb.h
+./kimgio/pcx.h
+./kdecore/kaudioplayer.h
+./kdecore/kcmdlineargs.h
+./kdecore/kmultipledrag.h
+./kdecore/kcheckaccelerators.h
+./kdecore/kipc.h
+./kdecore/kcrash.h
+./kdecore/kconfigskeleton.h
+./kdecore/kstringhandler.h
+./kdecore/kde_file.h
+./kdecore/ksimpleconfig.h
+./kdecore/kasyncio.h
+./kdecore/kglobalaccel_mac.h
+./kdecore/ktempfile.h
+./kdecore/kshell.h
+./kdecore/kcalendarsystemfactory.h
+./kdecore/kconfigbackend.h
+./kdecore/kconfigdata.h
+./kdecore/kdesktopfile.h
+./kdecore/kcalendarsystemgregorian.h
+./kdecore/ktypelist.h
+./kdecore/kcalendarsystemhijri.h
+./kdecore/kmacroexpander.h
+./kdecore/kpty.h
+./kdecore/kunload.h
+./kdecore/kicontheme.h
+./kdecore/kmdcodec.h
+./kdecore/ksycocatype.h
+./kdecore/netwm_def.h
+./kdecore/kkeynative.h
+./kdecore/kclipboard.h
+./kdecore/krfcdate.h
+./kdecore/kidna.h
+./kdecore/ksharedptr.h
+./kdecore/kstaticdeleter.h
+./kdecore/kaccelbase.h
+./kdecore/kaccelmanager.h
+./kdecore/kaboutdata.h
+./kdecore/kcalendarsystemjalali.h
+./kdecore/kglobalsettings.h
+./kdecore/ksycocadict.h
+./kdecore/kstandarddirs.h
+./kdecore/netwm_p.h
+./kdecore/kapp.h
+./kdecore/kshortcutlist.h
+./kdecore/kdebugclasses.h
+./kdecore/kdebug.h
+./kdecore/ksycocaentry.h
+./kdecore/kqiodevicegzip_p.h
+./kdecore/kuniqueapplication.h
+./kdecore/klibloader.h
+./kdecore/kiconeffect.h
+./kdecore/kshortcutmenu.h
+./kdecore/kglobalaccel_emb.h
+./kdecore/kkeyserver_x11.h
+./kdecore/kprocctrl.h
+./kdecore/kconfigdialogmanager.h
+./kdecore/ksycoca.h
+./kdecore/kcompletion.h
+./kdecore/kconfig.h
+./kdecore/kstdaccel.h
+./kdecore/kgenericfactory.h
+./kdecore/kpixmapprovider.h
+./kdecore/netsupp.h
+./kdecore/kdeversion.h
+./kdecore/kuser.h
+./kdecore/kextendedsocket.h
+./kdecore/kcalendarsystem.h
+./kdecore/kextsock.h
+./kdecore/kkeyserver.h
+./kdecore/krandomsequence.h
+./kdecore/klocale.h
+./kdecore/netwm.h
+./kdecore/kurldrag.h
+./kdecore/kaccelmanager_private.h
+./kdecore/klargefile.h
+./kdecore/kallocator.h
+./kdecore/ksycocafactory.h
+./kdecore/kurl.h
+./kdecore/ksockaddr.h
+./kdecore/kregexp.h
+./kdecore/kregpriv.h
+./kdecore/kbufferedio.h
+./kdecore/kdcoppropertyproxy.h
+./kdecore/kdelibs_export.h
+./kdecore/kdebugdcopiface.h
+./kdecore/kappdcopiface.h
+./kdecore/krootprop.h
+./kdecore/ktimezones.h
+./kdecore/kmdcodec_compat.h
+./kdecore/kwin.h
+./kdecore/kshortcut.h
+./kdecore/knotifyclient.h
+./kdecore/kaccelprivate.h
+./kdecore/kprocess.h
+./kdecore/kglobal.h
+./kdecore/ksocks.h
+./kdecore/ktempdir.h
+./kdecore/kcatalogue.h
+./kdecore/kprocio.h
+./kdecore/kaccelaction.h
+./kdecore/kstartupinfo.h
+./kdecore/kglobalaccel.h
+./kdecore/kstddirs.h
+./kdecore/kapplication.h
+./kdecore/kmimesourcefactory.h
+./kdecore/ksortablevaluelist.h
+./kdecore/kvmallocator.h
+./kdecore/kglobalaccel_win.h
+./kdecore/kpalette.h
+./kdecore/ksock.h
+./kdecore/ksavefile.h
+./kdecore/kwinmodule.h
+./kdecore/kglobalaccel_x11.h
+./kdecore/kxmessages.h
+./kdecore/kde_dmalloc.h
+./kdecore/kckey.h
+./kdecore/kiconloader_p.h
+./kdecore/fixx11h.h
+./kdecore/kaccel.h
+./kdecore/kprotocolinfofactory.h
+./kdecore/kmanagerselection.h
+./kdecore/kiconloader.h
+./kdecore/kcalendarsystemhebrew.h
+./kdecore/kinstance.h
+./kdecore/kmountpoint.h
+./kdecore/kxerrorhandler.h
+./kdecore/kcompletion_private.h
+./kdecore/kconfigbase.h
+./kdecore/kcharsets.h
+./kdecore/kuniqueapp.h
+./kdecore/klockfile.h
+./kdecore/svgicons/ksvgiconpainter.h
+./kdecore/svgicons/ksvgiconengine.h
+./kdecore/malloc/x86.h
+./kdecore/malloc/glibc.h
+./kdecore/network/ksocketdevice.h
+./kdecore/network/kserversocket.h
+./kdecore/network/ksrvresolverworker_p.h
+./kdecore/network/knetworkinterface.h
+./kdecore/network/kmulticastsocket.h
+./kdecore/network/kresolver.h
+./kdecore/network/kstreamsocket.h
+./kdecore/network/kreverseresolver.h
+./kdecore/network/kclientsocketbase.h
+./kdecore/network/kdatagramsocket.h
+./kdecore/network/kmulticastsocketdevice.h
+./kdecore/network/ksocketbuffer_p.h
+./kdecore/network/kresolver_p.h
+./kdecore/network/kresolverstandardworkers_p.h
+./kdecore/network/ksocketaddress.h
+./kdecore/network/kresolverworkerbase.h
+./kdecore/network/ksockssocketdevice.h
+./kdecore/network/kbufferedsocket.h
+./kdecore/network/khttpproxysocketdevice.h
+./kdecore/network/ksocketbase.h
+./kdecore/network/kiobuffer.h
+./kdecore/network/syssocket.h
+./kab/kabapi.h
+./kab/qconfigDB.h
+./kab/addressbook.h
+./kwallet/client/kwallet.h
+./kwallet/client/kwallettypes.h
+./kwallet/backend/cbc.h
+./kwallet/backend/blowfish.h
+./kwallet/backend/sha1.h
+./kwallet/backend/blowfishtables.h
+./kwallet/backend/kwalletentry.h
+./kwallet/backend/blockcipher.h
+./kwallet/backend/kwalletbackend.h
+./kdewidgets/classpreviews.h
+./dnssd/query.h
+./dnssd/sdevent.h
+./dnssd/responder.h
+./dnssd/publicservice.h
+./dnssd/domainbrowser.h
+./dnssd/servicebase.h
+./dnssd/remoteservice.h
+./dnssd/servicebrowser.h
+./interfaces/kio/http.h
+./interfaces/kscript/scriptloader.h
+./interfaces/kscript/scriptmanager.h
+./interfaces/kscript/scriptinterface.h
+./interfaces/kscript/scriptclientinterface.h
+./interfaces/kscript/sample/shellscript.h
+./interfaces/kspeech/kspeech.h
+./interfaces/kspeech/kspeechsink.h
+./interfaces/kregexpeditor/kregexpeditorinterface.h
+./interfaces/ktexteditor/undodcopinterface.h
+./interfaces/ktexteditor/undointerface.h
+./interfaces/ktexteditor/editorchooser.h
+./interfaces/ktexteditor/printdcopinterface.h
+./interfaces/ktexteditor/documentinfo.h
+./interfaces/ktexteditor/variableinterface.h
+./interfaces/ktexteditor/templateinterface.h
+./interfaces/ktexteditor/viewstatusmsginterface.h
+./interfaces/ktexteditor/codecompletioninterface.h
+./interfaces/ktexteditor/clipboardinterface.h
+./interfaces/ktexteditor/printinterface.h
+./interfaces/ktexteditor/searchdcopinterface.h
+./interfaces/ktexteditor/encodinginterface.h
+./interfaces/ktexteditor/clipboarddcopinterface.h
+./interfaces/ktexteditor/encodingdcopinterface.h
+./interfaces/ktexteditor/plugin.h
+./interfaces/ktexteditor/editinterface.h
+./interfaces/ktexteditor/cursorinterface.h
+./interfaces/ktexteditor/markinterfaceextension.h
+./interfaces/ktexteditor/texthintinterface.h
+./interfaces/ktexteditor/viewcursordcopinterface.h
+./interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+./interfaces/ktexteditor/editinterfaceext.h
+./interfaces/ktexteditor/dynwordwrapinterface.h
+./interfaces/ktexteditor/selectioninterface.h
+./interfaces/ktexteditor/configinterfaceextension.h
+./interfaces/ktexteditor/blockselectiondcopinterface.h
+./interfaces/ktexteditor/editdcopinterface.h
+./interfaces/ktexteditor/configinterface.h
+./interfaces/ktexteditor/sessionconfiginterface.h
+./interfaces/ktexteditor/editor.h
+./interfaces/ktexteditor/view.h
+./interfaces/ktexteditor/document.h
+./interfaces/ktexteditor/popupmenuinterface.h
+./interfaces/ktexteditor/searchinterface.h
+./interfaces/ktexteditor/selectionextdcopinterface.h
+./interfaces/ktexteditor/documentdcopinfo.h
+./interfaces/ktexteditor/highlightinginterface.h
+./interfaces/ktexteditor/blockselectioninterface.h
+./interfaces/ktexteditor/markinterface.h
+./interfaces/ktexteditor/selectiondcopinterface.h
+./interfaces/ktexteditor/selectioninterfaceext.h
+./interfaces/ktexteditor/viewcursorinterface.h
+./interfaces/ktexteditor/wordwrapinterface.h
+./interfaces/khexedit/clipboardinterface.h
+./interfaces/khexedit/byteseditinterface.h
+./interfaces/khexedit/zoominterface.h
+./interfaces/khexedit/valuecolumninterface.h
+./interfaces/khexedit/charcolumninterface.h
+./interfaces/kmediaplayer/playerdcopobject.h
+./interfaces/kmediaplayer/player.h
+./interfaces/kmediaplayer/view.h
+./interfaces/terminal/kde_terminal_interface.h
+./interfaces/terminal/test/main.h
+./interfaces/kimproxy/interface/kimiface.h
+./kstyles/kthemestyle/kthemestyle.h
+./kstyles/kthemestyle/kthemebase.h
+./kstyles/kthemestyle/kstyledirs.h
+./kstyles/web/webstyle.h
+./kstyles/highcontrast/highcontrast.h
+./kstyles/keramik/keramik.h
+./kstyles/keramik/bitmaps.h
+./kstyles/keramik/pixmaploader.h
+./kstyles/keramik/colorutil.h
+./kstyles/keramik/keramikimage.h
+./kstyles/keramik/gradients.h
+./kstyles/klegacy/klegacystyle.h
+./kstyles/highcolor/highcolor.h
+./kstyles/highcolor/bitmaps.h
+./kstyles/light/lightstyle-v3.h
+./kstyles/light/lightstyle-v2.h
+./kstyles/plastik/misc.h
+./kstyles/plastik/plastik.h
+./obj-i486-linux-gnu/config.h
+./obj-i486-linux-gnu/kjs/global.h
+./obj-i486-linux-gnu/kjs/lexer.lut.h
+./obj-i486-linux-gnu/kjs/string_object.lut.h
+./obj-i486-linux-gnu/kjs/number_object.lut.h
+./obj-i486-linux-gnu/kjs/array_object.lut.h
+./obj-i486-linux-gnu/kjs/math_object.lut.h
+./obj-i486-linux-gnu/kjs/date_object.lut.h
+./obj-i486-linux-gnu/kio/kssl/ksslconfig.h
+./obj-i486-linux-gnu/kio/kssl/keygenwizard2.h
+./obj-i486-linux-gnu/kio/kssl/keygenwizard.h
+./obj-i486-linux-gnu/kio/misc/observer_stub.h
+./obj-i486-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.h
+./obj-i486-linux-gnu/kio/misc/kwalletd/kwalletwizard.h
+./obj-i486-linux-gnu/kio/kio/uiserver_stub.h
+./obj-i486-linux-gnu/kio/kio/observer_stub.h
+./obj-i486-linux-gnu/kio/kfile/kpropertiesmimetypebase.h
+./obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.h
+./obj-i486-linux-gnu/kio/kfile/kpropertiesdesktopbase.h
+./obj-i486-linux-gnu/kio/kfile/knotifywidgetbase.h
+./obj-i486-linux-gnu/kdecore/kdemacros.h
+./obj-i486-linux-gnu/kate/part/katejscript.lut.h
+./obj-i486-linux-gnu/dnssd/settings.h
+./obj-i486-linux-gnu/interfaces/ktexteditor/editorchooser_ui.h
+./obj-i486-linux-gnu/interfaces/kimproxy/library/kimiface_stub.h
+./obj-i486-linux-gnu/kstyles/keramik/keramikrc.h
+./obj-i486-linux-gnu/kdeui/kshortcutdialog_simple.h
+./obj-i486-linux-gnu/kdeui/kshortcutdialog_advanced.h
+./obj-i486-linux-gnu/kdeui/kspellui.h
+./obj-i486-linux-gnu/kspell2/ui/kspell2ui.h
+./obj-i486-linux-gnu/kspell2/ui/configui.h
+./obj-i486-linux-gnu/khtml/kjserrordlg.h
+./obj-i486-linux-gnu/khtml/htmlpageinfo.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_traversal.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_mozilla.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_window.lut.h
+./obj-i486-linux-gnu/khtml/ecma/domparser.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_views.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_range.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_html.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_css.lut.h
+./obj-i486-linux-gnu/khtml/ecma/xmlhttprequest.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_dom.lut.h
+./obj-i486-linux-gnu/khtml/ecma/xmlserializer.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_events.lut.h
+./obj-i486-linux-gnu/khtml/ecma/kjs_navigator.lut.h
+./obj-i486-linux-gnu/kresources/manageriface_stub.h
+./obj-i486-linux-gnu/dcop/dcop-path.h
+./kutils/kcmoduleproxyIface.h
+./kutils/kmultitabbar_p.h
+./kutils/kreplace.h
+./kutils/kpluginselector_p.h
+./kutils/kcmoduleloader.h
+./kutils/kcmodulecontainer.h
+./kutils/kcmoduleinfo.h
+./kutils/kcmoduleproxy.h
+./kutils/kcmultidialog.h
+./kutils/kfinddialog.h
+./kutils/kmultitabbar.h
+./kutils/kreplacedialog.h
+./kutils/kfind.h
+./kutils/kpluginselector.h
+./kutils/kcmoduleproxyIfaceImpl.h
+./kutils/kplugininfo.h
+./kutils/ksettings/componentsdialog.h
+./kutils/ksettings/dialog.h
+./kutils/ksettings/pluginpage.h
+./kutils/ksettings/dispatcher.h
+./kdeui/kactionselector.h
+./kdeui/ktoolbarbutton.h
+./kdeui/kaccelgen.h
+./kdeui/kdatetimewidget.h
+./kdeui/kaboutkde.h
+./kdeui/kdatewidget.h
+./kdeui/kcolorbtn.h
+./kdeui/ktoolbarradiogroup.h
+./kdeui/ktimezonewidget.h
+./kdeui/kmenubar.h
+./kdeui/kconfigdialog.h
+./kdeui/kfontrequester.h
+./kdeui/knumvalidator.h
+./kdeui/ksystemtray.h
+./kdeui/kxmlguifactory_p.h
+./kdeui/kprogress.h
+./kdeui/kmainwindow.h
+./kdeui/kstdguiitem.h
+./kdeui/knuminput.h
+./kdeui/kiconviewsearchline.h
+./kdeui/ktabwidget.h
+./kdeui/kruler.h
+./kdeui/ktabctl.h
+./kdeui/ksharedpixmap.h
+./kdeui/kcolordlg.h
+./kdeui/kpopupmenu.h
+./kdeui/kcursor_private.h
+./kdeui/kcolorbutton.h
+./kdeui/kxmlgui.h
+./kdeui/kwizard.h
+./kdeui/kmessagebox.h
+./kdeui/kguiitem.h
+./kdeui/ktimewidget.h
+./kdeui/khelpmenu.h
+./kdeui/ktextedit.h
+./kdeui/klineeditdlg.h
+./kdeui/kwhatsthismanager_p.h
+./kdeui/ksplashscreen.h
+./kdeui/kdockwindow.h
+./kdeui/kfontdialog.h
+./kdeui/kcmenumngr.h
+./kdeui/ktoolbarhandler.h
+./kdeui/kdatetbl.h
+./kdeui/kpanelmenu.h
+./kdeui/kstdaction_p.h
+./kdeui/kaboutdialog.h
+./kdeui/kaction.h
+./kdeui/kmainwindowiface.h
+./kdeui/kbugreport.h
+./kdeui/kcmodule.h
+./kdeui/kled.h
+./kdeui/kactioncollection.h
+./kdeui/kselect.h
+./kdeui/kactionshortcutlist.h
+./kdeui/kiconview.h
+./kdeui/krootpixmap.h
+./kdeui/kpanelextension.h
+./kdeui/kdcopactionproxy.h
+./kdeui/kaboutdialog_private.h
+./kdeui/kinputdialog.h
+./kdeui/kpanelappmenu.h
+./kdeui/ktoolbar.h
+./kdeui/kkeydialog.h
+./kdeui/klistbox.h
+./kdeui/kpixmapregionselectorwidget.h
+./kdeui/kdialogbase_priv.h
+./kdeui/kdualcolorbtn.h
+./kdeui/kcolorcombo.h
+./kdeui/kspelldlg.h
+./kdeui/ktoolbarlabelaction.h
+./kdeui/kstringvalidator.h
+./kdeui/kwordwrap.h
+./kdeui/kdialogbase.h
+./kdeui/kscrollview.h
+./kdeui/kbuttonbox.h
+./kdeui/kkeybutton.h
+./kdeui/kjanuswidget.h
+./kdeui/kdockwidget_private.h
+./kdeui/kcursor.h
+./kdeui/kcolordialog.h
+./kdeui/keditlistbox.h
+./kdeui/qxembed.h
+./kdeui/ksconfig.h
+./kdeui/kdatepik.h
+./kdeui/kcolordrag.h
+./kdeui/kpassdlg.h
+./kdeui/kpixmapio.h
+./kdeui/kanimwidget.h
+./kdeui/kdockwidget_p.h
+./kdeui/kpushbutton.h
+./kdeui/kdialog.h
+./kdeui/kshortcutdialog.h
+./kdeui/kpassivepopup.h
+./kdeui/ktabbar.h
+./kdeui/kswitchlanguagedialog.h
+./kdeui/kcombobox.h
+./kdeui/ktip.h
+./kdeui/klanguagebutton.h
+./kdeui/kcompletionbox.h
+./kdeui/kpanelapplet.h
+./kdeui/kfontcombo.h
+./kdeui/kdualcolorbutton.h
+./kdeui/klistviewsearchline.h
+./kdeui/krestrictedline.h
+./kdeui/kspell.h
+./kdeui/kxmlguibuilder.h
+./kdeui/keditcl.h
+./kdeui/klineedit.h
+./kdeui/kauthicon.h
+./kdeui/ksqueezedtextlabel.h
+./kdeui/kaboutapplication.h
+./kdeui/kseparator.h
+./kdeui/kdepackages.h
+./kdeui/ktextbrowser.h
+./kdeui/kxmlguiclient.h
+./kdeui/klistviewlineedit.h
+./kdeui/kcharselect.h
+./kdeui/kstatusbar.h
+./kdeui/kedittoolbar.h
+./kdeui/kpixmapregionselectordialog.h
+./kdeui/kcommand.h
+./kdeui/karrowbutton.h
+./kdeui/kdatepicker.h
+./kdeui/ksyntaxhighlighter.h
+./kdeui/kdockwidget.h
+./kdeui/kactivelabel.h
+./kdeui/kactionclasses.h
+./kdeui/kwindowinfo.h
+./kdeui/kxmlguifactory.h
+./kdeui/klistview.h
+./kdeui/kwindowlistmenu.h
+./kdeui/kurllabel.h
+./kdeui/kstdaction.h
+./kdeui/kdetrayproxy/module.h
+./kdeui/kdetrayproxy/kdetrayproxy.h
+./kspell2/settings.h
+./kspell2/backgroundchecker.h
+./kspell2/backgroundengine.h
+./kspell2/backgroundthread.h
+./kspell2/dictionary.h
+./kspell2/defaultdictionary.h
+./kspell2/threadevents.h
+./kspell2/client.h
+./kspell2/broker.h
+./kspell2/filter.h
+./kspell2/ui/configwidget.h
+./kspell2/ui/dialog.h
+./kspell2/ui/configdialog.h
+./kspell2/ui/highlighter.h
+./kspell2/plugins/hspell/kspell_hspelldict.h
+./kspell2/plugins/hspell/kspell_hspellclient.h
+./kspell2/plugins/ispell/msgs.h
+./kspell2/plugins/ispell/kspell_ispellclient.h
+./kspell2/plugins/ispell/ispell_checker.h
+./kspell2/plugins/ispell/ispell_def.h
+./kspell2/plugins/ispell/sp_spell.h
+./kspell2/plugins/ispell/ispell.h
+./kspell2/plugins/ispell/kspell_ispelldict.h
+./kspell2/plugins/aspell/kspell_aspellclient.h
+./kspell2/plugins/aspell/kspell_aspelldict.h
+./khtml/khtml_factory.h
+./khtml/khtmlview.h
+./khtml/testkhtml.h
+./khtml/khtml_iface.h
+./khtml/khtml_printsettings.h
+./khtml/khtmldefaults.h
+./khtml/khtml_settings.h
+./khtml/khtml_caret_p.h
+./khtml/khtmlimage.h
+./khtml/khtml_part.h
+./khtml/khtml_run.h
+./khtml/khtml_events.h
+./khtml/khtml_pagecache.h
+./khtml/kjserrordlg.ui.h
+./khtml/khtml_ext.h
+./khtml/domtreeview.h
+./khtml/design.h
+./khtml/test_regression.h
+./khtml/khtmlpart_p.h
+./khtml/misc/loader_jpeg.h
+./khtml/misc/arena.h
+./khtml/misc/helper.h
+./khtml/misc/knsplugininstaller.h
+./khtml/misc/multimap.h
+./khtml/misc/htmltags.h
+./khtml/misc/htmlhashes.h
+./khtml/misc/khtmllayout.h
+./khtml/misc/seed.h
+./khtml/misc/htmlattrs.h
+./khtml/misc/decoder.h
+./khtml/misc/loader.h
+./khtml/misc/stringit.h
+./khtml/misc/guess_ja.h
+./khtml/misc/loader_client.h
+./khtml/misc/shared.h
+./khtml/kmultipart/kmultipart.h
+./khtml/dom/html_element.h
+./khtml/dom/dom_node.h
+./khtml/dom/dom_exception.h
+./khtml/dom/html_block.h
+./khtml/dom/dom2_traversal.h
+./khtml/dom/dom2_views.h
+./khtml/dom/dom_html.h
+./khtml/dom/dom_element.h
+./khtml/dom/html_document.h
+./khtml/dom/html_list.h
+./khtml/dom/css_extensions.h
+./khtml/dom/html_form.h
+./khtml/dom/dom_text.h
+./khtml/dom/html_misc.h
+./khtml/dom/html_image.h
+./khtml/dom/css_value.h
+./khtml/dom/html_head.h
+./khtml/dom/dom2_range.h
+./khtml/dom/dom2_events.h
+./khtml/dom/dom_misc.h
+./khtml/dom/html_object.h
+./khtml/dom/css_rule.h
+./khtml/dom/dom_xml.h
+./khtml/dom/dom_string.h
+./khtml/dom/html_table.h
+./khtml/dom/html_base.h
+./khtml/dom/dom_doc.h
+./khtml/dom/html_inline.h
+./khtml/dom/dom_core.h
+./khtml/dom/css_stylesheet.h
+./khtml/css/css_base.h
+./khtml/css/css_extensionsimpl.h
+./khtml/css/cssparser.h
+./khtml/css/css_valueimpl.h
+./khtml/css/cssvalues.h
+./khtml/css/csshelper.h
+./khtml/css/parser.h
+./khtml/css/cssproperties.h
+./khtml/css/css_stylesheetimpl.h
+./khtml/css/css_renderstyledeclarationimpl.h
+./khtml/css/cssstyleselector.h
+./khtml/css/css_ruleimpl.h
+./khtml/ecma/kjs_views.h
+./khtml/ecma/kjs_html.h
+./khtml/ecma/kjs_css.h
+./khtml/ecma/kjs_range.h
+./khtml/ecma/kjs_mozilla.h
+./khtml/ecma/domparser.h
+./khtml/ecma/kjs_binding.h
+./khtml/ecma/xmlhttprequest.h
+./khtml/ecma/kjs_window.h
+./khtml/ecma/xmlserializer.h
+./khtml/ecma/kjs_events.h
+./khtml/ecma/kjs_navigator.h
+./khtml/ecma/kjs_debugwin.h
+./khtml/ecma/kjs_traversal.h
+./khtml/ecma/kjs_proxy.h
+./khtml/ecma/kjs_dom.h
+./khtml/xml/dom_nodeimpl.h
+./khtml/xml/dom_xmlimpl.h
+./khtml/xml/dom_docimpl.h
+./khtml/xml/dom2_eventsimpl.h
+./khtml/xml/dom2_traversalimpl.h
+./khtml/xml/dom_restyler.h
+./khtml/xml/dom_stringimpl.h
+./khtml/xml/dom2_viewsimpl.h
+./khtml/xml/dom_elementimpl.h
+./khtml/xml/dom2_rangeimpl.h
+./khtml/xml/xml_tokenizer.h
+./khtml/xml/dom_textimpl.h
+./khtml/rendering/font.h
+./khtml/rendering/render_flow.h
+./khtml/rendering/render_line.h
+./khtml/rendering/render_block.h
+./khtml/rendering/render_generated.h
+./khtml/rendering/bidi.h
+./khtml/rendering/render_table.h
+./khtml/rendering/counter_tree.h
+./khtml/rendering/render_arena.h
+./khtml/rendering/render_list.h
+./khtml/rendering/render_replaced.h
+./khtml/rendering/render_form.h
+./khtml/rendering/render_body.h
+./khtml/rendering/break_lines.h
+./khtml/rendering/render_image.h
+./khtml/rendering/table_layout.h
+./khtml/rendering/render_applet.h
+./khtml/rendering/render_container.h
+./khtml/rendering/render_canvas.h
+./khtml/rendering/render_box.h
+./khtml/rendering/render_style.h
+./khtml/rendering/render_inline.h
+./khtml/rendering/render_br.h
+./khtml/rendering/render_object.h
+./khtml/rendering/enumerate.h
+./khtml/rendering/render_frames.h
+./khtml/rendering/render_layer.h
+./khtml/rendering/render_text.h
+./khtml/html/html_tableimpl.h
+./khtml/html/html_objectimpl.h
+./khtml/html/html_imageimpl.h
+./khtml/html/html_elementimpl.h
+./khtml/html/html_listimpl.h
+./khtml/html/html_headimpl.h
+./khtml/html/htmltokenizer.h
+./khtml/html/dtd.h
+./khtml/html/html_inlineimpl.h
+./khtml/html/htmlparser.h
+./khtml/html/html_documentimpl.h
+./khtml/html/html_formimpl.h
+./khtml/html/html_baseimpl.h
+./khtml/html/html_blockimpl.h
+./khtml/html/html_miscimpl.h
+./khtml/java/kjavaappletviewer.h
+./khtml/java/kjavaappletserver.h
+./khtml/java/kjavaappletcontext.h
+./khtml/java/kjavadownloader.h
+./khtml/java/kjavaappletwidget.h
+./khtml/java/kjavaprocess.h
+./khtml/java/kjavaapplet.h
+./khtml/java/kqeventutil.h
+./khtml/java/kxeventutil.h
+./kresources/configwidget.h
+./kresources/factory.h
+./kresources/selectdialog.h
+./kresources/configpage.h
+./kresources/kcmkresources.h
+./kresources/configdialog.h
+./kresources/managerimpl.h
+./kresources/manageriface.h
+./kresources/manager.h
+./kresources/resource.h
+./dcop/dcopobject.h
+./dcop/testdcop.h
+./dcop/version.h
+./dcop/dcopserver.h
+./dcop/dcoptypes.h
+./dcop/dcopref.h
+./dcop/dcopc.h
+./dcop/dcopstub.h
+./dcop/dcopglobal.h
+./dcop/dcop_deadlock_test.h
+./dcop/dcopsignals.h
+./dcop/kdatastream.h
+./dcop/dcopclient.h
+./dcop/dcopidl2cpp/main.h
+./dcop/dcopidl2cpp/type.h
+./dcop/dcopidl2cpp/dcopidl_test.h
+./dcop/KDE-ICE/ICE.h
+./dcop/KDE-ICE/ICEutil.h
+./dcop/KDE-ICE/ICEproto.h
+./dcop/KDE-ICE/ICElibint.h
+./dcop/KDE-ICE/ICElib.h
+./dcop/KDE-ICE/Xtransint.h
+./dcop/KDE-ICE/Xtrans.h
+./dcop/KDE-ICE/Xfuncproto.h
+./dcop/KDE-ICE/ICEconn.h
+./dcop/KDE-ICE/ICEmsg.h
+./dcop/KDE-ICE/globals.h
+./dcop/dcopidl/yacc.cc.h
+./dcop/dcopidl/dcopidl_test.h
+./libkmid/midispec.h
+./libkmid/dattypes.h
+./libkmid/synthout.h
+./libkmid/alsaout.h
+./libkmid/track.h
+./libkmid/sndcard.h
+./libkmid/notearray.h
+./libkmid/midiout.h
+./libkmid/midistat.h
+./libkmid/voiceman.h
+./libkmid/libkmid.h
+./libkmid/fmout.h
+./libkmid/deviceman.h
+./libkmid/gusvoices.h
+./libkmid/player.h
+./libkmid/mt32togm.h
+./libkmid/awe_sup.h
+./libkmid/midfile.h
+./libkmid/gusout.h
+./libkmid/midimapper.h
+./libltdl/ltdl_win.h
+./libltdl/ltdl.h
+./kmdi/kmdifocuslist.h
+./kmdi/kmdimainfrm.h
+./kmdi/kmditoolviewaccessor_p.h
+./kmdi/kmditoolviewaccessor.h
+./kmdi/kmdidocumentviewtabwidget.h
+./kmdi/kmdinulliterator.h
+./kmdi/kmdilistiterator.h
+./kmdi/kmdichildview.h
+./kmdi/kmdichildfrmcaption.h
+./kmdi/kmdichildarea.h
+./kmdi/kmdidefines.h
+./kmdi/kmdiiterator.h
+./kmdi/kmdiguiclient.h
+./kmdi/kmdichildfrm.h
+./kmdi/kmditaskbar.h
+./kmdi/kmdidockcontainer.h
+./kmdi/test/mainwidget.h
+./kmdi/test/hello.h
+./kmdi/kmdi/global.h
+./kmdi/kmdi/mainwindow.h
+./kmdi/kmdi/toolviewaccessor.h
+./kmdi/kmdi/tabwidget.h
+./kmdi/kmdi/dockcontainer.h
+./kmdi/kmdi/guiclient.h
+./kmdi/kmdi/toolviewaccessor_p.h
+./arts/kde/kplayobjectfactory_p.h
+./arts/kde/kconverttest.h
+./arts/kde/kartsfloatwatch.h
+./arts/kde/kaudiomanagerplay.h
+./arts/kde/kvideowidget.h
+./arts/kde/kdatarequest_impl.h
+./arts/kde/kaudioconverter.h
+./arts/kde/kartsdispatcher.h
+./arts/kde/kplayobject.h
+./arts/kde/kplayobjectcreator.h
+./arts/kde/kaudioplaystream.h
+./arts/kde/kaudioplaystream_p.h
+./arts/kde/kartsserver.h
+./arts/kde/kaudiorecordstream_p.h
+./arts/kde/kaudiorecordstream.h
+./arts/kde/kioinputstream_impl.h
+./arts/kde/kplayobjectfactory.h
+./kdefx/kimageeffect.h
+./kdefx/kpixmapeffect.h
+./kdefx/kstyle.h
+./kdefx/kpixmap.h
+./kdefx/kdrawutil.h
+./kdefx/kcpuinfo.h
+./kdefx/kpixmapsplitter.h
+./kabc/addresseedialog.h
+./kabc/timezone.h
+./kabc/stdaddressbook.h
+./kabc/phonenumber.h
+./kabc/vcardformat.h
+./kabc/distributionlist.h
+./kabc/ldifconverter.h
+./kabc/address.h
+./kabc/vcardtool.h
+./kabc/errorhandler.h
+./kabc/sound.h
+./kabc/key.h
+./kabc/addressee.h
+./kabc/vcardformatplugin.h
+./kabc/resourceselectdialog.h
+./kabc/addressbook.h
+./kabc/vcardconverter.h
+./kabc/formatplugin.h
+./kabc/agent.h
+./kabc/formatfactory.h
+./kabc/plugin.h
+./kabc/addresslineedit.h
+./kabc/lock.h
+./kabc/ldapconfigwidget.h
+./kabc/sortmode.h
+./kabc/ldapurl.h
+./kabc/field.h
+./kabc/secrecy.h
+./kabc/distributionlisteditor.h
+./kabc/vcard21parser.h
+./kabc/format.h
+./kabc/vcardformatimpl.h
+./kabc/picture.h
+./kabc/ldapclient.h
+./kabc/locknull.h
+./kabc/ldif.h
+./kabc/geo.h
+./kabc/distributionlistdialog.h
+./kabc/resource.h
+./kabc/addresseehelper.h
+./kabc/addresseelist.h
+./kabc/vcardparser/vcardline.h
+./kabc/vcardparser/vcardparser.h
+./kabc/vcardparser/vcard.h
+./kabc/vcardparser/testutils.h
+./kabc/scripts/addressee.src.h
+./kabc/vcard/include/VCardTextListValue.h
+./kabc/vcard/include/VCardEntity.h
+./kabc/vcard/include/VCardValue.h
+./kabc/vcard/include/VCardVCardEntity.h
+./kabc/vcard/include/VCardEnum.h
+./kabc/vcard/include/VCardContentLine.h
+./kabc/vcard/include/VCardNValue.h
+./kabc/vcard/include/VCardSoundValue.h
+./kabc/vcard/include/VCardPhoneNumberValue.h
+./kabc/vcard/include/VCardAdrValue.h
+./kabc/vcard/include/VCardImgValue.h
+./kabc/vcard/include/VCardTextBinParam.h
+./kabc/vcard/include/VCardClassValue.h
+./kabc/vcard/include/VCardTelValue.h
+./kabc/vcard/include/VCardVCard.h
+./kabc/vcard/include/VCardUTCValue.h
+./kabc/vcard/include/VCardDateParam.h
+./kabc/vcard/include/VCardGeoValue.h
+./kabc/vcard/include/VCardEmailParam.h
+./kabc/vcard/include/VCardDefines.h
+./kabc/vcard/include/VCardImageValue.h
+./kabc/vcard/include/VCardRToken.h
+./kabc/vcard/include/VCardAgentValue.h
+./kabc/vcard/include/VCardAdrParam.h
+./kabc/vcard/include/VCardSourceParam.h
+./kabc/vcard/include/VCardImageParam.h
+./kabc/vcard/include/VCardTelParam.h
+./kabc/vcard/include/VCardTextBinValue.h
+./kabc/vcard/include/VCard.h
+./kabc/vcard/include/VCardDateValue.h
+./kabc/vcard/include/VCardParam.h
+./kabc/vcard/include/VCardURIValue.h
+./kabc/vcard/include/VCardAgentParam.h
+./kabc/vcard/include/VCardGroup.h
+./kabc/vcard/include/VCardSndValue.h
+./kabc/vcard/include/VCardFloatValue.h
+./kabc/vcard/include/VCardOrgValue.h
+./kabc/vcard/include/VCardTextValue.h
+./kabc/vcard/include/VCardTextParam.h
+./kabc/vcard/include/VCardLangValue.h
+./kabc/vcard/include/generated/AdrValue-generated.h
+./kabc/vcard/include/generated/VCardEntity-generated.h
+./kabc/vcard/include/generated/ParamName-generated.h
+./kabc/vcard/include/generated/VCard-generated.h
+./kabc/vcard/include/generated/Value-generated.h
+./kabc/vcard/include/generated/TextValue-generated.h
+./kabc/vcard/include/generated/SourceParam-generated.h
+./kabc/vcard/include/generated/TextBinParam-generated.h
+./kabc/vcard/include/generated/AgentParam-generated.h
+./kabc/vcard/include/generated/ImageParam-generated.h
+./kabc/vcard/include/generated/GeoValue-generated.h
+./kabc/vcard/include/generated/AgentValue-generated.h
+./kabc/vcard/include/generated/TelParam-generated.h
+./kabc/vcard/include/generated/TextParam-generated.h
+./kabc/vcard/include/generated/TextBinValue-generated.h
+./kabc/vcard/include/generated/UTCValue-generated.h
+./kabc/vcard/include/generated/NValue-generated.h
+./kabc/vcard/include/generated/DateValue-generated.h
+./kabc/vcard/include/generated/ContentLine-generated.h
+./kabc/vcard/include/generated/EmailParam-generated.h
+./kabc/vcard/include/generated/DateParam-generated.h
+./kabc/vcard/include/generated/Param-generated.h
+./kabc/vcard/include/generated/TextListValue-generated.h
+./kabc/vcard/include/generated/URIValue-generated.h
+./kabc/vcard/include/generated/Group-generated.h
+./kabc/vcard/include/generated/FloatValue-generated.h
+./kabc/vcard/include/generated/ImageValue-generated.h
+./kabc/vcard/include/generated/ClassValue-generated.h
+./kabc/vcard/include/generated/SoundValue-generated.h
+./kabc/vcard/include/generated/ParamValue-generated.h
+./kabc/vcard/include/generated/PhoneNumberValue-generated.h
+./kabc/vcard/include/generated/TelValue-generated.h
+./kabc/vcard/include/generated/OrgValue-generated.h
+./kabc/vcard/include/generated/ImgParam-generated.h
+./kabc/vcard/include/generated/Name-generated.h
+./kabc/vcard/include/generated/AdrParam-generated.h
+./kabc/vcard/include/generated/ImgValue-generated.h
+./kabc/vcard/include/generated/LangValue-generated.h
+./kabc/vcard/include/generated/TextNSParam-generated.h
+./knewstuff/testnewstuff.h
+./knewstuff/entry.h
+./knewstuff/knewstuffsecure.h
+./knewstuff/uploaddialog.h
+./knewstuff/knewstuffgeneric.h
+./knewstuff/providerdialog.h
+./knewstuff/downloaddialog.h
+./knewstuff/knewstuff.h
+./knewstuff/provider.h
+./knewstuff/engine.h
+./knewstuff/knewstuffbutton.h
+./knewstuff/ghns.h
+./knewstuff/security.h
+./kunittest/tester.h
+./kunittest/module.h
+./kunittest/runner.h
+./kunittest/samplemodule.h
+./kparts/mainwindow.h
+./kparts/event.h
+./kparts/componentfactory.h
+./kparts/factory.h
+./kparts/partmanager.h
+./kparts/browserinterface.h
+./kparts/historyprovider.h
+./kparts/plugin.h
+./kparts/statusbarextension.h
+./kparts/dockmainwindow.h
+./kparts/part.h
+./kparts/design.h
+./kparts/genericfactory.h
+./kparts/browserrun.h
+./kparts/browserextension.h
+./kdecore/kde-config.cpp.in
--- kdelibs-3.5.10.dfsg.1.orig/configure.in
+++ kdelibs-3.5.10.dfsg.1/configure.in
@@ -21,7 +21,9 @@
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdelibs, "3.5.10") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdelibs.dfsg.1, "3.5.10") dnl searches for some needed programs
+
+AM_MAINTAINER_MODE
 
 AC_PROG_INSTALL
 
@@ -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 =======================================================
@@ -1138,10 +1119,11 @@
   ac_LDFLAGS_save="$LDFLAGS"
   LDFLAGS="$LDFLAGS $all_libraries"
   kde_cups_config=
-  kde_cups_libs="-lcups $LIBDL $LIBSOCKET"
+  kde_cups_libs="-lcups"
   AC_PATH_PROG(kde_cups_config,cups-config)
   if test -n "$kde_cups_config"; then
-    kde_cups_libs=`$kde_cups_config --libs`
+#    kde_cups_libs=`$kde_cups_config --libs`
+    kde_cups_libs="$kde_cups_libs"
   else
     AC_MSG_RESULT(cups-config not found, using default libraries: $kde_cups_libs. You should consider upgrading CUPS)
   fi
@@ -1962,10 +1944,10 @@
 
     KDE_FIND_PATH(pcre-config, PCRE_CONFIG, [${exec_prefix}/bin ${prefix}/bin], [PCRE_CONFIG="" ])
     if test -n "$PCRE_CONFIG" && $PCRE_CONFIG --libs >/dev/null 2>&1; then
-        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,,"`
+        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,," -e "s,[\b-].\+pcreposix[^[:space:]]*\b,,"`
         PCRECFLAGS=`$PCRE_CONFIG --cflags`
     else
-        LIBPCRE="-lpcre -lpcreposix"
+        LIBPCRE="-lpcre"
         PCRECFLAGS=
     fi
     AC_CACHE_VAL(ac_cv_have_pcreposix, [
@@ -2198,11 +2180,12 @@
 AM_CONDITIONAL(kjs_SUBDIR_included, test "x$kjs_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kwallet_SUBDIR_included, test "x$kwallet_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kio_SUBDIR_included, test "x$kio_SUBDIR_included" = xyes)
+AM_CONDITIONAL(kded_SUBDIR_included, test "x$kded_SUBDIR_included" = xyes)
+AM_CONDITIONAL(kded_post_SUBDIR_included, test "x$kded_post_SUBDIR_included" = xyes)
 AM_CONDITIONAL(arts_SUBDIR_included, test "x$arts_SUBDIR_included" = xyes)
 AM_CONDITIONAL(dnssd_SUBDIR_included, test "x$dnssd_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kab_SUBDIR_included, test "x$kab_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kconf_update_SUBDIR_included, test "x$kconf_update_SUBDIR_included" = xyes)
-AM_CONDITIONAL(kded_SUBDIR_included, test "x$kded_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kdoctools_SUBDIR_included, test "x$kdoctools_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kimgio_SUBDIR_included, test "x$kimgio_SUBDIR_included" = xyes)
 AM_CONDITIONAL(kioslave_SUBDIR_included, test "x$kioslave_SUBDIR_included" = xyes)
@@ -2300,6 +2283,7 @@
 AC_CONFIG_FILES([ kdecore/tests/Makefile ])
 AC_CONFIG_FILES([ kded/Makefile ])
 AC_CONFIG_FILES([ kded/test/Makefile ])
+AC_CONFIG_FILES([ kded_post/Makefile ])
 AC_CONFIG_FILES([ kdefx/Makefile ])
 AC_CONFIG_FILES([ kdeprint/Makefile ])
 AC_CONFIG_FILES([ kdeprint/cups/Makefile ])
--- kdelibs-3.5.10.dfsg.1.orig/subdirs
+++ kdelibs-3.5.10.dfsg.1/subdirs
@@ -8,11 +8,12 @@
 kjs
 kwallet
 kio
+kded
+kded_post
 arts
 dnssd
 kab
 kconf_update
-kded
 kdoctools
 kimgio
 kioslave
--- kdelibs-3.5.10.dfsg.1.orig/aclocal.m4
+++ kdelibs-3.5.10.dfsg.1/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -13,13 +13,171 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# 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://pkg-config.freedesktop.org/>.])],
+		[$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, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +192,7 @@
 [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.1], [],
+m4_if([$1], [1.10.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -48,12 +206,12 @@
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -303,57 +461,68 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # 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 3
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # 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.
-  # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # 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.
+    # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -543,6 +712,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.
@@ -659,13 +857,13 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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 3
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -682,7 +880,7 @@
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/allfiles.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/allfiles.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=所有的檔案
 Comment[zh_TW]=所有的檔案
 Comment[zu]=Wonke Amafayela
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -92,6 +92,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -206,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@
@@ -234,6 +235,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -243,6 +245,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -271,6 +274,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -321,6 +325,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -378,6 +383,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -393,12 +399,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -409,8 +415,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -431,9 +437,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:
@@ -534,7 +540,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -755,8 +761,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/all.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/all.desktop
@@ -78,3 +78,4 @@
 Comment[zh_CN]=全部文件和文件夹
 Comment[zh_HK]=所有的檔案與目錄目錄
 Comment[zh_TW]=所有的檔案與目錄目錄
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/multipart/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/multipart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -373,12 +379,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -389,8 +395,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -411,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:
@@ -590,8 +596,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/multipart/mixed.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/multipart/mixed.desktop
@@ -80,3 +80,4 @@
 Comment[zh_TW]=複合文件
 Comment[zu]=Uhlu lwamafayela Eliphindwe kabili
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/multipart/x-mixed-replace.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/multipart/x-mixed-replace.desktop
@@ -81,3 +81,4 @@
 Comment[zh_TW]=資料串流（伺服器推送）
 Comment[zu]=Ukutanta kwe-Data (Ukududula Komlekeleli)
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-mng.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-mng.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=MNG 圖檔
 Comment[zh_TW]=MNG 影像
 Comment[zu]=Isithombe se-MNG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-matroska.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-matroska.desktop
@@ -72,3 +72,4 @@
 Comment[zh_CN]=Matroska 视频
 Comment[zh_HK]=Matroska 視像檔
 Comment[zh_TW]=Matroska 視頻檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-ms-wmv.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-ms-wmv.desktop
@@ -76,3 +76,4 @@
 MimeType=video/x-ms-wmv
 Patterns=*.wmv
 Type=MimeType
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/mpeg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/mpeg.desktop
@@ -79,3 +79,4 @@
 Comment[zh_HK]=MPEG 視像檔
 Comment[zh_TW]=MPEG 視頻文件
 Comment[zu]=Ividiyo lwe-MPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/mp4.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/mp4.desktop
@@ -75,3 +75,4 @@
 Comment[zh_HK]=MPEG-4 視像檔
 Comment[zh_TW]=MPEG 視頻檔案
 X-KDE-IsAlso=video/quicktime
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/quicktime.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/quicktime.desktop
@@ -77,3 +77,4 @@
 Comment[zh_HK]=Quicktime 視像檔
 Comment[zh_TW]=Quicktime 視頻文件
 Comment[zu]=Ividiyo Yesikhathi Esheshayo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/avi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/avi.desktop
@@ -80,3 +80,4 @@
 Comment[zh_HK]=微軟 AVI 視像檔
 Comment[zh_TW]=微軟 AVI 視頻文件
 Comment[zu]=Ividiyo le-Microsoft AVI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-ogm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-ogm.desktop
@@ -74,3 +74,4 @@
 Comment[zh_CN]=Ogg/Ogm 视频
 Comment[zh_HK]=Ogg/Ogm 視像檔
 Comment[zh_TW]=Ogg/Ogm 視頻檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -377,12 +383,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -393,8 +399,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -415,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:
@@ -594,8 +600,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-msvideo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-msvideo.desktop
@@ -79,3 +79,4 @@
 Comment[zh_HK]=微軟 AVI 視像檔
 Comment[zh_TW]=微軟 AVI 視頻文件
 Comment[zu]=Ividiyo le-Microsoft AVI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-theora.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-theora.desktop
@@ -71,3 +71,4 @@
 Comment[zh_CN]=Theora 文件
 Comment[zh_HK]=Theora 視像檔
 Comment[zh_TW]=Theora 視頻檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-ms-asf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-ms-asf.desktop
@@ -76,3 +76,4 @@
 Comment[zh_HK]=ASF 媒體
 Comment[zh_TW]=ASF 媒體
 Comment[zu]=Abasiki bebunda be-ASF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/vnd.rn-realvideo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/vnd.rn-realvideo.desktop
@@ -81,3 +81,4 @@
 Comment[zh_HK]=RealVideo 視像檔
 Comment[zh_TW]=RealVideo 檔案
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/video/x-flic.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/video/x-flic.desktop
@@ -86,3 +86,4 @@
 Comment[zh_TW]=Autodesk 的 FLIC 文件
 Comment[zu]=Ifayela Ledeski elizenzekelayo le-FLIC
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/message/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/message/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -373,12 +379,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -389,8 +395,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -411,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:
@@ -590,8 +596,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/message/news.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/message/news.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/message/rfc822.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/message/rfc822.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-ms-wma.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-ms-wma.desktop
@@ -66,3 +66,4 @@
 Comment[zh_CN]=Windows Media 音频
 Comment[zh_HK]=Windows Media 音效檔
 Comment[zh_TW]=WIndows Media 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/vorbis.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/vorbis.desktop
@@ -77,3 +77,4 @@
 Comment[zh_CN]=Ogg Vorbis 音频
 Comment[zh_HK]=Ogg Vorbis 音效檔
 Comment[zh_TW]=Ogg Vorbis 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-matroska.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-matroska.desktop
@@ -75,3 +75,4 @@
 Comment[zh_CN]=Matroska 音频
 Comment[zh_HK]=Matroska 音效檔
 Comment[zh_TW]=Matroska 聲音
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-mp3.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-mp3.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=MPEG Layer 3 音效檔
 Comment[zh_TW]=MP3 音樂
 Comment[zu]=Ozwakalayo Ugqinsi 3 we-MPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-pn-realaudio.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-pn-realaudio.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=RealAudio 文件
 Comment[zh_HK]=RealAudio 檔案
 Comment[zh_TW]=RealAudio 檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/mpeg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/mpeg.desktop
@@ -73,3 +73,4 @@
 Comment[vi]=Âm thanh MPEG
 Comment[zh_CN]=MPEG 音频
 Comment[zh_HK]=MPEG 音效檔
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/mp4.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/mp4.desktop
@@ -75,3 +75,4 @@
 Comment[zh_CN]=MPEG4 音频
 Comment[zh_HK]=MPEG-4 音效檔
 X-KDE-IsAlso=video/quicktime
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-flac.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-flac.desktop
@@ -76,3 +76,4 @@
 MimeType=audio/x-flac
 Icon=sound
 Patterns=*.flac;*.FLAC;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-midi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-midi.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=MIDI 音效檔
 Comment[zh_TW]=MIDI 聲音文件
 Comment[zu]=Okuzwakalayo kwe-MIDI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-aiff.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-aiff.desktop
@@ -83,3 +83,4 @@
 MimeType=audio/x-aiff
 Icon=sound
 Patterns=*.aiff;*.AIFF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-scpls.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-scpls.desktop
@@ -86,3 +86,4 @@
 Patterns=*.pls;*.PLS;
 Icon=sound
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/mpegurl.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/mpegurl.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=串流 MP3 音樂
 Comment[zh_TW]=串流 MP3 音樂
 Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/basic.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/basic.desktop
@@ -83,3 +83,4 @@
 MimeType=audio/basic
 Icon=sound
 Patterns=*.au;*.AU;*.snd;*.SND
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-speex.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-speex.desktop
@@ -75,3 +75,4 @@
 Comment[zh_CN]=Speex 音频
 Comment[zh_HK]=Speex 音效檔
 Comment[zh_TW]=Speex 聲音
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-mod.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-mod.desktop
@@ -79,3 +79,4 @@
 Comment[zh_HK]=Amiga Soundtracker 音效檔
 Comment[zh_TW]=Amiga 聲軌聲音文件
 Comment[zu]=Ozwakalayo Umlandeli womsindo we-Amiga
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -382,12 +388,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -398,8 +404,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -420,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:
@@ -589,7 +595,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=ac3.desktop x-mod.desktop mp4.desktop Makefile.in x-flac.desktop x-pn-realaudio.desktop basic.desktop x-mp2.desktop mpeg.desktop x-matroska.desktop x-vorbis.desktop x-mpegurl.desktop x-pn-realaudio-plugin.desktop x-aiff.desktop prs.sid.desktop aac.desktop vnd.rn-realaudio.desktop x-oggflac.desktop mpegurl.desktop x-ms-wma.desktop x-midi.desktop x-speex.desktop x-adpcm.desktop vorbis.desktop x-scpls.desktop x-mp3.desktop x-wav.desktop Makefile.am x-musepack.desktop 
+KDE_DIST=ac3.desktop x-mod.desktop mp4.desktop Makefile.in x-flac.desktop x-pn-realaudio.desktop basic.desktop x-mp2.desktop mpeg.desktop x-matroska.desktop x-vorbis.desktop x-mpegurl.desktop x-pn-realaudio-plugin.desktop x-aiff.desktop prs.sid.desktop aac.desktop vnd.rn-realaudio.desktop x-oggflac.desktop mpegurl.desktop x-ms-wma.desktop x-midi.desktop x-speex.desktop x-adpcm.desktop vorbis.desktop x-scpls.desktop x-mp3.desktop x-wav.desktop x-musepack.desktop Makefile.am 
 
 #>+ 2
 docs-am:
@@ -599,8 +605,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-mp2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-mp2.desktop
@@ -71,3 +71,4 @@
 Comment[zh_CN]=MP2 音频文件
 Comment[zh_HK]=MPEG Layer 2 音效檔
 Comment[zh_TW]=MPEG Layer 2 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-pn-realaudio-plugin.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-pn-realaudio-plugin.desktop
@@ -52,3 +52,4 @@
 Comment[uz@cyrillic]=RealAudio плагин файли
 Comment[zh_CN]=RealAudio 插件文件
 Comment[zh_TW]=RealAudio 外掛程式檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-musepack.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-musepack.desktop
@@ -68,3 +68,4 @@
 Comment[zh_CN]=Musepack 音频
 Comment[zh_HK]=Musepack 音效檔
 Comment[zh_TW]=Musepack 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/prs.sid.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/prs.sid.desktop
@@ -73,3 +73,4 @@
 Comment[zh_CN]=C64 SID 音频
 Comment[zh_HK]=C64 SID 音樂
 Comment[zh_TW]=C64 SID 音樂
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-oggflac.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-oggflac.desktop
@@ -76,3 +76,4 @@
 Comment[zh_CN]=Ogg FLAC 音频
 Comment[zh_HK]=Ogg FLAC 音效檔
 Comment[zh_TW]=Ogg FLAC 聲音
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-wav.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-wav.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=WAV 音效檔
 Comment[zh_TW]=WAV 聲音文件
 Comment[zu]=Okuzwakalayo kwe-WAV
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/ac3.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/ac3.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=杜比 AC3 声音
 Comment[zh_HK]=杜比 AC3 音效檔
 Comment[zh_TW]=Dolby AC3 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/aac.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/aac.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=AAC 声音
 Comment[zh_HK]=AAC 音效檔
 Comment[zh_TW]=AAC 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/vnd.rn-realaudio.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/vnd.rn-realaudio.desktop
@@ -85,3 +85,4 @@
 Type=QString
 Value=.ra
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-vorbis.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-vorbis.desktop
@@ -77,3 +77,4 @@
 Comment[zh_CN]=Ogg Vorbis 音频
 Comment[zh_HK]=Ogg Vorbis 音效檔
 Comment[zh_TW]=Ogg Vorbis 音效
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-mpegurl.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-mpegurl.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=串流 MP3 音樂
 Comment[zh_TW]=串流 MP3 音樂
 Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/audio/x-adpcm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/audio/x-adpcm.desktop
@@ -87,3 +87,4 @@
 Type=QString
 Value=.wav
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-ghostscript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-ghostscript.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=Ghostscript 字形
 Comment[zh_TW]=Ghostscript 字形
 Comment[zu]=Uhlobo lwamagama lwama-Ghostscripts
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-karbon.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-karbon.desktop
@@ -87,3 +87,4 @@
 Comment[zh_HK]=Karbon14 文件
 Comment[zh_TW]=Karbon14 文件
 Comment[zu]=Uhlu lwamafayela lwe-Karbon14
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/mspowerpoint.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/mspowerpoint.desktop
@@ -81,3 +81,4 @@
 Comment[zh_CN]=Microsoft PowerPoint 演示文稿
 Comment[zh_HK]=微軟 PowerPoint 文件
 Comment[zh_TW]=微軟 PowerPoint 文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-java.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-java.desktop
@@ -82,3 +82,4 @@
 Comment[xh]=Uhlobo lwe Java
 Comment[zh_CN]=Java 类
 Comment[zu]=Ikilasi lwe-Java
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-rar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-rar.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Rar 壓縮檔
 Comment[zh_TW]=Rar 壓縮檔案
 Comment[zu]=Umqulu we-Rar
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-executable.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-executable.desktop
@@ -84,3 +84,4 @@
 Icon=exec
 Type=MimeType
 MimeType=application/x-executable
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-awk.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-awk.desktop
@@ -86,3 +86,4 @@
 Type=MimeType
 MimeType=application/x-awk
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-msaccess.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-msaccess.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=Microsoft Access 数据库
 Comment[zh_HK]=Microsoft Access 資料庫
 Comment[zh_TW]=Microsoft Access 資料庫
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pgp-keys.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp-keys.desktop
@@ -76,3 +76,4 @@
 Comment[zh_CN]=OpenPGP 秘钥束
 X-KDE-AutoEmbed=true
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-hancomword.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-hancomword.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=HancomWord 文件
 Comment[zh_TW]=HancomWord 文件
 Comment[zu]=Uhlu lwamafayela lwe-HancomWord
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.impress.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.impress.desktop
@@ -82,3 +82,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sxi
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.chart.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.chart.desktop
@@ -74,3 +74,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odc
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-bz2dvi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bz2dvi.desktop
@@ -76,3 +76,4 @@
 Type=MimeType
 X-KDE-AutoEmbed=true
 X-KDE-IsAlso=application/x-bzip2
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-sqlite3.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-sqlite3.desktop
@@ -69,3 +69,4 @@
 Comment[zh_CN]=SQLite3 数据库文件
 Comment[zh_HK]=SQLite3 資料庫檔案
 Comment[zh_TW]=SQLite3 資料庫檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-egon.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-egon.desktop
@@ -57,3 +57,4 @@
 Comment[uz@cyrillic]=Egon аниматор
 Comment[ven]=Zwipuka zwa Egon
 Comment[xh]=Umphilisi we Egon
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.writer.master.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.writer.master.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sxg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pgp.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp.desktop
@@ -77,3 +77,4 @@
 Comment[zh_CN]=PGP 加密或签名的信件
 Comment[zh_HK]=PGP 加密或簽名的訊息
 Comment[zh_TW]=PGP 加密或簽名的訊息
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tgz.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tgz.desktop
@@ -93,3 +93,4 @@
 Type=QString
 Value=tar
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/mbox.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/mbox.desktop
@@ -69,3 +69,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-sharedlib.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-sharedlib.desktop
@@ -85,3 +85,4 @@
 Type=MimeType
 MimeType=application/x-sharedlib
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-lyx.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-lyx.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-zoo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-zoo.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Zoo 壓縮檔
 Comment[zh_TW]=Zoo 壓縮文件
 Comment[zu]=Umqulu We-zoo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.base.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.base.desktop
@@ -74,3 +74,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odb
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-python.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-python.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-msdos-program.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-msdos-program.desktop
@@ -87,3 +87,4 @@
 Type=QString
 Value=.exe
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kformula.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kformula.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kfo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-compress.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-compress.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=UNIX 壓縮檔
 Comment[zh_TW]=UNIX 壓縮檔案
 Comment[zu]=Ifayela Elicindezelwe lwe-Unix
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/msword.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/msword.desktop
@@ -91,3 +91,4 @@
 Type=QString
 Value=.doc
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/octet-stream.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/octet-stream.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=未知
 Comment[zh_TW]=未知
 Comment[zu]=Okungaziwa
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.rn-realmedia.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.rn-realmedia.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=RealMedia 文件
 Comment[zh_HK]=RealMedia 檔案
 Comment[zh_TW]=RealMedia 檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-siag.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-siag.desktop
@@ -82,3 +82,4 @@
 Icon=spreadsheet
 Type=MimeType
 Patterns=*.siag;*.csv;*.wk1;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ots
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/msexcel.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/msexcel.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=微軟 Excel 表格
 Comment[zh_TW]=微軟 Excel 表格
 Comment[zu]= Ipheshana lesitayela le-Microsoft Excel
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-magicpoint.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-magicpoint.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=MagicPoint 演示文稿
 Comment[zh_HK]=MagicPoint 簡報
 Comment[zh_TW]=MagicPoint 簡報
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/xsd.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/xsd.desktop
@@ -73,3 +73,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/xml.desktop
@@ -85,3 +85,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-pcf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-pcf.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=PCF 點陣字形
 Comment[zh_TW]=PCF 點陣字形
 Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-PCF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-ruby.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-ruby.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-xliff.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-xliff.desktop
@@ -75,3 +75,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.xlf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-gnumeric.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gnumeric.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=GNUmeric 試算表
 Comment[zh_TW]=GNUmeric 試算表
 Comment[zu]=Iphephashana elinwebekayo le-GNUmeric
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pkcs7-mime.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pkcs7-mime.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=PKCS#7 (S/MIME) 格式資料
 Comment[zh_TW]=PKCS#7 (S/MIME) 格式資料
 Comment[zu]=Idata Efakwe kwisakhelo ye-PKCS#7 (S/MIME) 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.formula.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.formula.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-pkcs12.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-pkcs12.desktop
@@ -81,3 +81,4 @@
 Comment[zu]=Isigaxa Sezitifiketi se-PKCS#12
 X-KDE-AutoEmbed=true
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-arj.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-arj.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=ARJ 壓縮檔
 Comment[zh_TW]=ARJ 壓縮檔案
 Comment[zu]=Umqulu we-ARJ
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-shellscript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-shellscript.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-x509-ca-cert.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-x509-ca-cert.desktop
@@ -87,3 +87,4 @@
 Comment[zu]=DER, PEM, noma Isitifiketi Esifakwe ikhodi se X.509
 X-KDE-AutoEmbed=true
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-ttf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-ttf.desktop
@@ -80,3 +80,4 @@
 Type=MimeType
 MimeType=application/x-font-ttf
 Patterns=*.ttf;*.TTF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-gzdvi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzdvi.desktop
@@ -76,3 +76,4 @@
 Type=MimeType
 X-KDE-AutoEmbed=true
 X-KDE-IsAlso=application/x-gzip
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/chm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/chm.desktop
@@ -69,3 +69,4 @@
 MimeType=application/chm
 Patterns=*.chm;*.CHM
 Type=MimeType
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kugar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kugar.desktop
@@ -87,3 +87,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kdf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-mswrite.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-mswrite.desktop
@@ -88,3 +88,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.wri
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kde-wallet.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kde-wallet.desktop
@@ -80,3 +80,4 @@
 Patterns=*.kwl
 X-KDE-AutoEmbed=false
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-msmetafile.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-msmetafile.desktop
@@ -3,3 +3,4 @@
 MimeType=application/x-msmetafile
 Icon=vectorgfx
 X-KDE-IsAlso=image/x-wmf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-arc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-arc.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=ARC 归档
 Comment[zh_HK]=ARC 壓縮檔
 Comment[zh_TW]=ARC 壓縮檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pkcs7-signature.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pkcs7-signature.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=分離的 S/MIME 簽名
 Comment[zh_TW]=分離的 S/MIME 簽名
 Comment[zu]=Uphawu lokusayina lwe-S/MIME Oluxebukile
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-applixword.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-applixword.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Applix 文書處理文件
 Comment[zh_TW]=Applix 文書處理文件
 Comment[zu]=Uhlu lwamafayela Lamagama lwe-Applix
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-type1.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-type1.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=PostScript Type1 字形
 Comment[zh_TW]=PostScript Type1 字形
 Comment[zu]=Uhlobo lwamagama 1 lwe-PostScript Esidlulile Sohlobo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-abiword.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-abiword.desktop
@@ -86,3 +86,4 @@
 Comment[zu]=Uhlu lwamafayela e-AbiWord
 Icon=wordprocessing
 Patterns=*.abw;*.ABW;*.abw.gz;*.zabw;*.abw.bz2;*.bzabw;*.awt
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-dvi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-dvi.desktop
@@ -85,3 +85,4 @@
 MimeType=application/x-dvi
 Patterns=*.dvi;*.DVI;
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ott
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.calc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.calc.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sdc
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/illustrator.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/illustrator.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=Adobe Illustrator 文件
 Comment[zh_TW]=Adobe Illustrator 文件
 Comment[zu]=Umkhombisi Wohlu lwamafayela e-Adobe
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-perl-module.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-perl-module.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-mplayer2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-mplayer2.desktop
@@ -59,3 +59,4 @@
 Comment[uz@cyrillic]=Microsoft Media тури
 Comment[zh_CN]=Microsoft 媒体格式
 Comment[zh_TW]=Microsoft 媒體格式
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kivio.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kivio.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.flw
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-webarchive.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-webarchive.desktop
@@ -81,3 +81,4 @@
 [Property::X-KDE-LocalProtocol]
 Type=QString
 Value=tar
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.writer-global.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.writer-global.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sgl
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-rar-compressed.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-rar-compressed.desktop
@@ -87,3 +87,4 @@
 Comment[zh_TW]=Rar 壓縮檔案
 Comment[zu]=Umqulu we-Rar
 X-KDE-IsAlso=application/x-rar
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-desktop.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-desktop.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-core.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-core.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=程式 crash 資料
 Comment[zh_TW]=程式 crash 資料
 Comment[zu]=Idata Yohlelo lwendlela Ephahlazekile
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-jar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-jar.desktop
@@ -88,3 +88,4 @@
 Comment[zh_TW]=Java 壓縮檔案
 Comment[zu]=Umqulu we-Java
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-ttc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-ttc.desktop
@@ -79,3 +79,4 @@
 Type=MimeType
 MimeType=application/x-font-ttc
 Patterns=*.ttc;*.TTC
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/java.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/java.desktop
@@ -82,3 +82,4 @@
 Comment[zh_CN]=Java 类
 Comment[zu]=Ikilasi lwe-Java
 X-KDE-IsAlso=application/x-java
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.writer.template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.writer.template.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.stw
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-quattropro.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-quattropro.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Quattro Pro 文件
 Comment[zh_TW]=Quattro Pro 文件
 Comment[zu]=Uhlu lwamafayela lwe-Quattro Pro
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-zerosize.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-zerosize.desktop
@@ -85,3 +85,4 @@
 MimeType=application/x-zerosize
 Type=MimeType
 Icon=empty
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/xml-dtd.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/xml-dtd.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.dtd
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-java-applet.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-java-applet.desktop
@@ -73,3 +73,4 @@
 MimeType=application/x-java-applet
 Icon=java_jar
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-cda.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-cda.desktop
@@ -80,3 +80,4 @@
 MimeType=application/x-cda
 Icon=cdtrack
 Patterns=*.cda;*.CDA
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-7z.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-7z.desktop
@@ -72,3 +72,4 @@
 Comment[zh_CN]=7-Zip 归档
 Comment[zh_HK]=7-Zip 壓縮檔
 Comment[zh_TW]=7-Zip 壓縮文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-bzip.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bzip.desktop
@@ -86,3 +86,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.bz;*.BZ;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/xhtml+xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/xhtml+xml.desktop
@@ -85,3 +85,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kchart.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kchart.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.chrt
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -433,7 +439,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)
@@ -442,12 +448,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -458,8 +464,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -480,9 +486,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:
@@ -656,7 +662,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-compress.desktop x-sharedlib.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 uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-afm.desktop x-executable-script.desktop x-pkcs12.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-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.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-core.desktop x-zoo.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-tex-gf.desktop x-7z.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 x-applixgraphics.desktop vnd.stardivision.writer-global.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-bittorrent.desktop x-cda.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.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 xhtml+xml.desktop x-shellscript.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-linguist.desktop x-font-speedo.desktop 
 
 #>+ 2
 docs-am:
@@ -666,8 +672,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-pak.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-pak.desktop
@@ -73,3 +73,4 @@
 Comment[zh_CN]=PAK 文件归档
 Comment[zh_HK]=PAK 壓縮檔
 Comment[zh_TW]=PAK 檔案壓縮
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-object.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-object.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=目標代碼
 Comment[zh_TW]=目標代碼
 Comment[zu]=Ikhodi Yenhloso
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-applixgraphics.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-applixgraphics.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Applix 繪圖文件
 Comment[zh_TW]=Applix 影像文件
 Comment[zu]=Uhlu lwamafayela Lwemidwebo ye-Applix
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/wordperfect.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/wordperfect.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=WordPerfect 文件
 Comment[zh_TW]=WordPerfect 文件
 Comment[zu]=Uhlu lwmafayela lwe-S/MIME
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pgp-signature.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp-signature.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=分離的 OpenPGP 簽名
 Comment[zh_TW]=分離的 OpenPGP 簽名
 Comment[zu]=Uphawu lokusayina lwe-OpenPGP Oluxebukile
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tex-pk.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tex-pk.desktop
@@ -85,3 +85,4 @@
 Type=MimeType
 MimeType=application/x-tex-pk
 Patterns=*.pk;*.PK;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kcsrc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kcsrc.desktop
@@ -81,3 +81,4 @@
 Comment[zh_CN]=KDE 色彩主题
 Comment[zh_HK]=KDE 色彩佈景
 Comment[zh_TW]=KDE 色彩佈景
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tar.desktop
@@ -91,3 +91,4 @@
 Type=QString
 Value=tar
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kpresenter.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kpresenter.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kpr
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-graphite.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-graphite.desktop
@@ -87,3 +87,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.gra
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-gzpostscript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzpostscript.desktop
@@ -88,3 +88,4 @@
 Type=MimeType
 X-KDE-AutoEmbed=true
 X-KDE-IsAlso=application/x-gzip
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-executable-script.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-executable-script.desktop
@@ -73,3 +73,4 @@
 Type=MimeType
 MimeType=application/x-executable-script
 X-KDE-IsAlso=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
@@ -82,3 +82,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kug
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-perl.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-perl.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-bittorrent.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bittorrent.desktop
@@ -79,3 +79,4 @@
 Type=MimeType
 Patterns=*.torrent;*.tor
 X-KDE-AutoEmbed=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.draw.template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.draw.template.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.std
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-archive.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-archive.desktop
@@ -85,3 +85,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.a;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-zip-compressed.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-zip-compressed.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-LocalProtocol]
 Type=QString
 Value=zip
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tex-gf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tex-gf.desktop
@@ -85,3 +85,4 @@
 Type=MimeType
 MimeType=application/x-tex-gf
 Patterns=*.gf;*.GF;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kword.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kword.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kwd
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-otf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-otf.desktop
@@ -80,3 +80,4 @@
 Type=MimeType
 MimeType=application/x-font-otf
 Patterns=*.otf;*.OTF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/mathml+xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/mathml+xml.desktop
@@ -82,3 +82,4 @@
 Comment[zh_CN]=MathML 文档
 Comment[zh_HK]=MathML 文件
 Comment[zh_TW]=MathML 文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-javascript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-javascript.desktop
@@ -79,3 +79,4 @@
 Type=bool
 Value=true
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.math.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.math.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sdf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.palm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.palm.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=Palm 文档
 Comment[zh_HK]=Palm 文件
 Comment[zh_TW]=Palm 文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.ms-powerpoint.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.ms-powerpoint.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ppt
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-python-bytecode.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-python-bytecode.desktop
@@ -83,3 +83,4 @@
 Comment[zh_TW]=Python 位元碼
 Comment[zu]=Ikhodi le-byte le-Python
 X-KDE-IsAlso=application/x-executable
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/ogg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/ogg.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=Ogg 多媒體
 Comment[zh_TW]=Ogg 多媒體
 Comment[zu]=Onozindaba be-Ogg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.impress.template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.impress.template.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sti
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/fits.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/fits.desktop
@@ -64,3 +64,4 @@
 Icon=binary
 # Note: application/fits is for any kind of FITS, so also for non-images
 ### TODO: what file pattern, especially that image/fits has the same
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/relaxng.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/relaxng.desktop
@@ -12,3 +12,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-cpio.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-cpio.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=CPIO 壓縮檔
 Comment[zh_TW]=CPIO 壓縮檔案
 Comment[zu]=Umqulu we-CPIO
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-bdf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-bdf.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=BDF 點陣字形
 Comment[zh_TW]=BDF 點陣字形
 Comment[zu]=Uhlobo lwamagama Lwe-Bitmap ye-BDF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-speedo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-speedo.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=Speedo 字形
 Comment[zh_TW]=Speedo 字形
 Comment[zu]=Uhlobo lwamagama lwe-Speedo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-bzip2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bzip2.desktop
@@ -86,3 +86,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.bz2;*.BZ2;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-java-jnlp-file.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-java-jnlp-file.desktop
@@ -65,3 +65,4 @@
 Comment[zh_HK]=Java Web Start 程式
 Comment[zh_TW]=Java Web Start 應用程式
 MimeType=application/x-java-jnlp-file
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/postscript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/postscript.desktop
@@ -98,3 +98,4 @@
 Type=QString
 Value=.ps
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.writer.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.writer.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sxw
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-applixspread.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-applixspread.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Applix 電子表格文件
 Comment[zh_TW]=Applix 電子表格文件
 Comment[zu]=Uhlu lwamafayela Lwamapheshana anwebekayo e-Applix
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.ms-asf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.ms-asf.desktop
@@ -74,3 +74,4 @@
 Comment[zh_HK]=ASF 媒體
 Comment[zh_TW]=ASF 媒體
 Comment[zu]=Abasiki bebunda be-ASF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.writer.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.writer.desktop
@@ -86,3 +86,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sdw
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-afm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-afm.desktop
@@ -76,3 +76,4 @@
 Type=MimeType
 MimeType=application/x-afm
 Patterns=*.afm;*.AFM
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.ms-word.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.ms-word.desktop
@@ -88,3 +88,4 @@
 Type=QString
 Value=.doc
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.image.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.image.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odi
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kontour.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kontour.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kon
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-gettext.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gettext.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-pw.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-pw.desktop
@@ -80,3 +80,4 @@
 Icon=wordprocessing
 Type=MimeType
 Patterns=*.pw;*.PW;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/sieve.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/sieve.desktop
@@ -85,3 +85,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.chart.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.chart.desktop
@@ -73,3 +73,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sds
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.calc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.calc.desktop
@@ -82,3 +82,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sxc
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-linguist.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-linguist.desktop
@@ -78,3 +78,4 @@
 Comment[zh_CN]=Qt 翻译源文件
 Comment[zh_HK]=QT Translation 原始檔案
 Comment[zh_TW]=QT Translation 原始檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-iso.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-iso.desktop
@@ -72,3 +72,4 @@
 Comment[zh_CN]=ISO9660 映像文件
 Comment[zh_HK]=ISO9660 影像檔
 Comment[zh_TW]=ISO9660 映像檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.text.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.text.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odt
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.otp
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kudesigner.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kudesigner.desktop
@@ -82,3 +82,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ktf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-vnd.kde.kexi.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-vnd.kde.kexi.desktop
@@ -84,3 +84,4 @@
 Type=QString
 Value=.kexi
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-vnd.kde.kplato.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-vnd.kde.kplato.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kplato
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-lzop.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-lzop.desktop
@@ -87,3 +87,4 @@
 Comment[zh_HK]=Lzopped 檔案
 Comment[zh_TW]=Lzopped 檔案
 Comment[zu]=Ifayela le-Lzopped
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-designer.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-designer.desktop
@@ -85,3 +85,4 @@
 Type=MimeType
 MimeType=application/x-designer
 Patterns=*.ui;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ods
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-php.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-php.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-rpm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-rpm.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=RPM 套件檔案
 Comment[zh_TW]=RPM 套件檔案
 Comment[zu]=Ifayela Lephakethe le-RPM
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-trash.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-trash.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=備份檔
 Comment[zh_TW]=備份檔案
 Comment[zu]=Ifayela Lokugcina okwesibili
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kpovmodeler.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kpovmodeler.desktop
@@ -84,3 +84,4 @@
 MimeType=application/x-kpovmodeler
 Patterns=*.kpm;
 Type=MimeType
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tbz.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tbz.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.tar.bz2
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.draw.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.draw.desktop
@@ -80,3 +80,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sxd
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.mozilla.xul+xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.mozilla.xul+xml.desktop
@@ -74,3 +74,4 @@
 Comment[zh_CN]=Mozilla XUL 文件
 Comment[zh_HK]=Mozilla XUL 檔案
 Comment[zh_TW]=Mozilla XUL 檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-mimearchive.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-mimearchive.desktop
@@ -68,3 +68,4 @@
 [Property::X-KDE-LocalProtocol]
 Type=QString
 Value=mhtml
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-deb.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-deb.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=Debian 包
 Comment[zh_HK]=Debian 套件
 Comment[zh_TW]=Debian 軟體包
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.sun.xml.calc.template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.sun.xml.calc.template.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.stc
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-ogg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-ogg.desktop
@@ -81,3 +81,4 @@
 Comment[zh_HK]=Ogg 多媒體
 Comment[zh_TW]=Ogg 多媒體
 Comment[zu]=Onozindaba be-Ogg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/uninstall.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/uninstall.desktop
@@ -1,3 +1,4 @@
 [Desktop Entry]
 MimeType=dummy
 Hidden=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pkcs10.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pkcs10.desktop
@@ -86,3 +86,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.p10
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tarz.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tarz.desktop
@@ -91,3 +91,4 @@
 Type=QString
 Value=tar
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.draw.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.draw.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sda
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-sqlite2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-sqlite2.desktop
@@ -69,3 +69,4 @@
 Comment[zh_CN]=SQLite2 数据库文件
 Comment[zh_HK]=SQLite2 資料庫檔案
 Comment[zh_TW]=SQLite2 資料庫檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/smil.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/smil.desktop
@@ -74,3 +74,4 @@
 Comment[zh_HK]=同步多媒體整合式語言
 Comment[zh_TW]=同步多媒體整合式語言
 Comment[zu]=Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.ms-excel.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.ms-excel.desktop
@@ -86,3 +86,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.xls
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-dbase.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-dbase.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=dBASE 文件
 Comment[zh_TW]=dBASE 文件
 Comment[zu]=Uhlu lwamafayela dBASE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tgif.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tgif.desktop
@@ -85,3 +85,4 @@
 MimeType=application/x-tgif
 Type=MimeType
 Icon=vectorgfx
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-ica.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-ica.desktop
@@ -71,3 +71,4 @@
 Type=MimeType
 Patterns=*.ica;*.ICA;
 X-KDE-AutoEmbed=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-shockwave-flash.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-shockwave-flash.desktop
@@ -61,3 +61,4 @@
 Comment[zh_TW]=Shockwave Flash 媒體檔案
 Comment[zu]=Igagasi lokuthuka le-Flash Media
 X-KDE-AutoEmbed=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-krita.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-krita.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.kra
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pdf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pdf.desktop
@@ -91,3 +91,4 @@
 Type=QString
 Value=.pdf
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-troff-man.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-troff-man.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-kspread.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-kspread.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.ksp
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/pgp-encrypted.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp-encrypted.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=PGP/MIME 加密的郵件檔頭
 Comment[zh_TW]=PGP/MIME 加密的郵件檔頭
 Comment[zu]=Umyalezo Wenhloko Wolwazi olungaqondakali lwe-PGP/MIME
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-nzb.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-nzb.desktop
@@ -0,0 +1 @@
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-zip.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-zip.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-LocalProtocol]
 Type=QString
 Value=zip
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-ace.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-ace.desktop
@@ -80,3 +80,4 @@
 Comment[zh_CN]=ACE 归档
 Comment[zh_HK]=Arc 壓縮檔 
 Comment[zh_TW]=Arc 壓縮檔案 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-font-snf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-font-snf.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=SNF 點陣字形
 Comment[zh_TW]=SNF 點陣字形
 Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-SNF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-gzip.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzip.desktop
@@ -86,3 +86,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.gz;*.tgz;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-lha.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-lha.desktop
@@ -86,3 +86,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.lha;*.lzh;*.LHA;*.LZH;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.stardivision.impress.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.stardivision.impress.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sdd
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-amipro.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-amipro.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=Lotus AmiPro 文件
 Comment[zh_TW]=Lotus AmiPro 文件
 Comment[zu]=Uhlu lwamafayela lwe-Lotus AmiPro
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.odp
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
@@ -77,3 +77,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.otg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-troff.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-troff.desktop
@@ -91,3 +91,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-cue.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-cue.desktop
@@ -56,3 +56,4 @@
 Comment[tt]=CDRWIN Cue-Cäymäse
 Comment[uk]=Файл диску CDRWIN
 Comment[vi]=Tờ hiệu báo CDRWIN
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/application/x-tzo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tzo.desktop
@@ -88,3 +88,4 @@
 Icon=tgz
 Type=MimeType
 Patterns=*.tar.lzo;*.tzo;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/block.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/block.desktop
@@ -86,3 +86,4 @@
 Type=MimeType
 MimeType=inode/blockdevice
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/directory-locked.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/directory-locked.desktop
@@ -80,3 +80,4 @@
 MimeType=inode/directory-locked
 X-KDE-isAlso=inode/directory
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/socket.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/socket.desktop
@@ -69,3 +69,4 @@
 Type=MimeType
 MimeType=inode/socket
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -375,12 +381,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -391,8 +397,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -413,9 +419,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:
@@ -592,8 +598,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/chardevice.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/chardevice.desktop
@@ -86,3 +86,4 @@
 Type=MimeType
 MimeType=inode/chardevice
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/fifo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/fifo.desktop
@@ -80,3 +80,4 @@
 Type=MimeType
 MimeType=inode/fifo
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/inode/directory.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/inode/directory.desktop
@@ -77,3 +77,4 @@
 Type=MimeType
 MimeType=inode/directory
 Patterns=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/mmsu.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/mmsu.desktop
@@ -46,3 +46,4 @@
 Comment[vi]=Địa điểm URI mmsu:
 Comment[zh_CN]=mmsu: URI
 Comment[zh_HK]=mmsu: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/rtspt.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/rtspt.desktop
@@ -46,3 +46,4 @@
 Comment[vi]=Địa điểm URI rtspt:
 Comment[zh_CN]=rtspt: URI
 Comment[zh_HK]=rtspt: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/pnm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/pnm.desktop
@@ -45,3 +45,4 @@
 Comment[vi]=Địa điểm URI pnm:
 Comment[zh_CN]=pnm: URI
 Comment[zh_HK]=pnm: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -373,12 +379,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -389,8 +395,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -411,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:
@@ -590,8 +596,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/mmst.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/mmst.desktop
@@ -46,3 +46,4 @@
 Comment[vi]=Địa điểm URI mmst:
 Comment[zh_CN]=mmst: URI
 Comment[zh_HK]=mmst: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/mms.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/mms.desktop
@@ -46,3 +46,4 @@
 Comment[vi]=Địa điểm URI mms:
 Comment[zh_CN]=mms: URI
 Comment[zh_HK]=mms: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/uri/rtspu.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/uri/rtspu.desktop
@@ -46,3 +46,4 @@
 Comment[vi]=Địa điểm URI rtspu:
 Comment[zh_CN]=rtspu: URI
 Comment[zh_HK]=rtspu: 格式 URI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-java.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-java.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-adasrc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-adasrc.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-vcalendar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-vcalendar.desktop
@@ -87,3 +87,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-moc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-moc.desktop
@@ -87,3 +87,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-objchdr.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-objchdr.desktop
@@ -76,3 +76,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-bibtex.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-bibtex.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-python.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-python.desktop
@@ -87,3 +87,4 @@
 # alias of application/x-python
 X-KDE-IsAlso=application/x-python
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-vcard.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-vcard.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-csv.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-csv.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/css.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/css.desktop
@@ -72,3 +72,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/html.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/html.desktop
@@ -85,3 +85,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/xml.desktop
@@ -88,3 +88,4 @@
 [Property::X-KDE-NativeExtension]
 Type=QString
 Value=.xml
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/calendar.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/calendar.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-xslfo.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-xslfo.desktop
@@ -86,3 +86,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-katefilelist.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-katefilelist.desktop
@@ -85,3 +85,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/rtf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/rtf.desktop
@@ -90,3 +90,4 @@
 Type=QString
 Value=Microsoft Word
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-ldif.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-ldif.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/sgml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/sgml.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-c++src.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-c++src.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -594,7 +600,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-katefilelist.desktop x-vcard.desktop rdf.desktop x-mswinurl.desktop x-adasrc.desktop x-hex.desktop Makefile.in uninstall.desktop x-vcalendar.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-python.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop xml.desktop docbook.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop 
+KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-katefilelist.desktop x-vcard.desktop x-mswinurl.desktop rdf.desktop x-adasrc.desktop x-hex.desktop Makefile.in uninstall.desktop x-vcalendar.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-python.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop docbook.desktop xml.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop 
 
 #>+ 2
 docs-am:
@@ -604,8 +610,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-xslt.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-xslt.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-objcsrc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-objcsrc.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/vnd.abc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/vnd.abc.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/plain.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/plain.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/enriched.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/enriched.desktop
@@ -75,3 +75,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-chdr.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-chdr.desktop
@@ -91,3 +91,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-tcl.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-tcl.desktop
@@ -91,3 +91,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-makefile.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-makefile.desktop
@@ -40,3 +40,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/rss.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/rss.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-csrc.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-csrc.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-diff.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-diff.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/docbook.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/docbook.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-c++hdr.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-c++hdr.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-tex.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-tex.desktop
@@ -91,3 +91,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/javascript.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/javascript.desktop
@@ -73,3 +73,4 @@
 Comment[zh_HK]=JavaScript 檔案
 Comment[zh_TW]=JavaScript 檔案
 X-KDE-IsAlso=application/x-javascript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/rdf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/rdf.desktop
@@ -81,3 +81,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-hex.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-hex.desktop
@@ -67,3 +67,4 @@
 Comment[vi]=Dạng thức tập tin đối tượng thập lục Intel®
 Comment[zh_CN]=Intel® 十六进制目标文件
 Comment[zh_TW]=Intel® 十六進位目的檔案格式
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/uninstall.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/uninstall.desktop
@@ -1,3 +1,4 @@
 [Desktop Entry]
 MimeType=dummy
 Hidden=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-pascal.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-pascal.desktop
@@ -89,3 +89,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-mswinurl.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-mswinurl.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=網址捷徑
 Comment[zh_TW]=網路捷徑
 Comment[zu]=Indlela emfushane ye-Internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/vnd.wap.wml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/vnd.wap.wml.desktop
@@ -90,3 +90,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-log.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-log.desktop
@@ -88,3 +88,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/text/x-latex.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/text/x-latex.desktop
@@ -84,3 +84,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/model/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/model/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -373,12 +379,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -389,8 +395,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -411,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:
@@ -590,8 +596,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/model/vrml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/model/vrml.desktop
@@ -83,3 +83,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-raw.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-raw.desktop
@@ -63,3 +63,4 @@
 Comment[vi]=Ảnh PCX
 Comment[zh_CN]=RAW 相机图像
 Comment[zh_TW]=原始 Camera 影像
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-portable-bitmap.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-portable-bitmap.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=PBM 圖檔
 Comment[zh_TW]=可攜式點陣檔案格式
 Comment[zu]=Isithombe Semephu yebit Esiphathekayo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-vnd.adobe.photoshop.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-vnd.adobe.photoshop.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=Adobe Photoshop 图像
 Comment[zh_HK]=Adobe Photoshop 圖檔
 Comment[zh_TW]=Adobe Photoshop 影像
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-eps.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-eps.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=Encapsulated PostScript 圖檔
 Comment[zh_TW]=封裝的 PostScript 影像
 Comment[zu]=Isithombe Esifakwe ephaketheni Lesithombe Sesikripti Esidlulele
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-targa.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-targa.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=Truevision Targa 圖檔
 Comment[zh_TW]=Truevision Targa 圖形
 Comment[zu]=Isithombe Sombono wangempela we-Targa
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/tiff.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/tiff.desktop
@@ -87,3 +87,4 @@
 Comment[zh_HK]=TIFF 圖檔
 Comment[zh_TW]=TIFF 影像
 Comment[zu]=Isithombe se-TIFF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/cgm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/cgm.desktop
@@ -74,3 +74,4 @@
 Comment[zh_HK]=CGM 圖檔
 Comment[zh_TW]=電腦繪圖檔案
 Comment[zu]=Ifayela leMeta Lemidwebo Yekhomputha
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-wmf.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-wmf.desktop
@@ -72,3 +72,4 @@
 Comment[xh]=Ifayile ye Meta ye Windows
 Comment[zh_CN]=Windows 元文件
 Comment[zu]=Ama-window eMetaFayela
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-dds.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-dds.desktop
@@ -57,3 +57,4 @@
 Comment[uk]=Поверхня DirectDraw
 Comment[vi]=Mặt DirectDraw
 Comment[zh_CN]=DirectDraw 表面
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/svg-xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/svg-xml.desktop
@@ -3,3 +3,4 @@
 Type=MimeType
 MimeType=image/svg-xml
 X-KDE-IsAlso=image/svg+xml
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-xcursor.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-xcursor.desktop
@@ -79,3 +79,4 @@
 Comment[zh_HK]=X11 滑鼠游標
 Comment[zh_TW]=X11 滑鼠游標
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/jpg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/jpg.desktop
@@ -3,3 +3,4 @@
 Type=MimeType
 MimeType=image/jpg
 X-KDE-IsAlso=image/jpeg
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-pcx.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-pcx.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=PCX 圖檔
 Comment[zh_TW]=PCX 影像
 Comment[zu]=Isithombe se-PCX
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/jp2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/jp2.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=JPEG 2000 图像
 Comment[zh_HK]=JPEG 2000 圖檔
 Comment[zh_TW]=JPEG 200 影像
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/jpeg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/jpeg.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=JPEG 圖檔
 Comment[zh_TW]=JPEG 影像
 Comment[zu]=Isithombe se-JPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-xbm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-xbm.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=X BitMap 圖檔
 Comment[zh_TW]=X 點陣影像
 Comment[zu]=Isithombe se-X BitMap
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-vnd.trolltech.qpicture.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-vnd.trolltech.qpicture.desktop
@@ -75,3 +75,4 @@
 Comment[vi]=Siêu tập tin Qpicture
 Comment[zh_CN]=QPicture 元文件
 Comment[zh_TW]=QPicture Meta 檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -383,12 +389,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -399,8 +405,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -421,9 +427,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:
@@ -604,8 +610,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-msod.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-msod.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=Microsoft Office 繪圖
 Comment[zh_TW]=MS Office 圖片
 Comment[zu]=Umdwebo we-Microsoft Office
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-ico.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-ico.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=Windows 圖示
 Comment[zh_TW]=MSWindows 圖示
 Comment[zu]=Uphawu lwesithombe Lama-window
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-portable-greymap.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-portable-greymap.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=PGM 圖檔
 Comment[zh_TW]=可攜式灰階檔案格式
 Comment[zu]=Isithombe se-Graymap Esiphathekayo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/png.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/png.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=PNG 圖檔
 Comment[zh_TW]=PNG 影像
 Comment[zu]=Isithombe se-PNG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-djvu.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-djvu.desktop
@@ -70,3 +70,4 @@
 Comment[zh_CN]=DjVu 文档
 Comment[zh_HK]=DjVu 圖檔
 Comment[zh_TW]=DjVu 文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/fits.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/fits.desktop
@@ -71,3 +71,4 @@
 ### TODO: what file patterns, especially that application/fits has the same
 # RFC 4047 tells that image/fits are also application/fits
 X-KDE-IsAlso=application/fits
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-jng.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-jng.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=JNG 圖檔
 Comment[zh_TW]=JNG 影像
 Comment[zu]=Isithombe se-JNG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-photo-cd.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-photo-cd.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=PhotoCD 圖檔
 Comment[zh_TW]=PhotoCD 影像
 Comment[zu]=Isithombe Sesithombe se-CD
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/svg+xml.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/svg+xml.desktop
@@ -78,3 +78,4 @@
 [Property::X-KDE-text]
 Type=bool
 Value=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-portable-pixmap.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-portable-pixmap.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=PPM 圖檔
 Comment[zh_TW]=可攜式像素檔案格式
 Comment[zu]=Isithombe se-Pixmap Esiphathekayo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-xfig.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-xfig.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=XFig 檔案
 Comment[zh_TW]=XFig 檔案
 Comment[zu]=Ifayela le-XFig
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-exr.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-exr.desktop
@@ -74,3 +74,4 @@
 Comment[zh_CN]=ILM EXR 图像
 Comment[zh_TW]=ILM EXR 影像
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-rgb.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-rgb.desktop
@@ -75,3 +75,4 @@
 Comment[zh_CN]=SGI 图像(RGB)
 Comment[zh_HK]=SGI 圖檔 (RGB)
 Comment[zh_TW]=SGI 影像 (RGB)
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/fax-g3.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/fax-g3.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=CCITT G3 傳真
 Comment[zh_TW]=CCITT G3 傳真
 Comment[zu]=I-fax le-CCITT
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/uninstall.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/uninstall.desktop
@@ -1,3 +1,4 @@
 [Desktop Entry]
 MimeType=dummy
 Hidden=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/gif.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/gif.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=GIF 圖檔
 Comment[zh_TW]=GIF 影像
 Comment[zu]=Isithombe se-GIF
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-bmp.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-bmp.desktop
@@ -79,3 +79,4 @@
 Comment[zh_CN]=BMP 图像
 Comment[zh_HK]=BMP 圖檔
 Comment[zh_TW]=BMP 影像
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-hdr.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-hdr.desktop
@@ -58,3 +58,4 @@
 Comment[uk]=Зображення HDR (High Dynamic Range)
 Comment[vi]=Ảnh phạm vị động cao
 Comment[zh_CN]=高动态范围图像
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/pjpeg.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/pjpeg.desktop
@@ -86,3 +86,4 @@
 Comment[zh_HK]=JPEG 圖檔
 Comment[zh_TW]=JPEG 影像
 Comment[zu]=Isithombe se-JPEG
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-djvu-2.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-djvu-2.desktop
@@ -70,3 +70,4 @@
 Comment[zh_CN]=DjVu 文档
 Comment[zh_HK]=DjVu 圖檔
 Comment[zh_TW]=DjVu 文件
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-xcf-gimp.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-xcf-gimp.desktop
@@ -82,3 +82,4 @@
 MimeType=image/x-xcf-gimp
 Patterns=*.xcf;
 Type=MimeType
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/mimetypes/image/x-xpm.desktop
+++ kdelibs-3.5.10.dfsg.1/mimetypes/image/x-xpm.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=X PixMap 圖檔
 Comment[zh_TW]=X 像素影像
 Comment[zu]=Isithombe se-XPixMap
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kcert/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kcert/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -114,6 +114,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -228,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@
@@ -256,6 +257,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -265,6 +267,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -293,6 +296,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -343,6 +347,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -400,6 +405,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -411,7 +417,7 @@
 kde_module_LTLIBRARIES = libkcertpart.la
 libkcertpart_la_SOURCES = kcertpart.cc
 libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkcertpart_la_LIBADD = $(LIB_KPARTS)
+libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KDECORE)
 libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
 #>- libkcertpart_la_METASOURCES = AUTO
 servicedir = $(kde_servicesdir)
@@ -424,12 +430,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -440,8 +446,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -462,9 +468,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -570,7 +576,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -784,8 +790,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kcert/kcertpart.desktop
+++ kdelibs-3.5.10.dfsg.1/kcert/kcertpart.desktop
@@ -97,3 +97,4 @@
 ServiceTypes=KParts/ReadWritePart
 X-KDE-Library=libkcertpart
 InitialPreference=15
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kjs/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kjs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -170,6 +170,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -284,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@
@@ -312,6 +313,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -321,6 +323,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -349,6 +352,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -399,6 +403,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -456,6 +461,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -511,12 +517,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -527,8 +533,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -549,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
 
 global.h: stamp-h5
@@ -563,7 +569,7 @@
 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 $@
@@ -702,7 +708,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1026,8 +1032,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/application.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/application.desktop
@@ -122,3 +122,4 @@
 [PropertyDef::X-KDE-Protocols]
 Type=QStringList
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/renamedlgplugin.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/renamedlgplugin.desktop
@@ -82,3 +82,4 @@
 Comment[zh_HK]=更名對話盒的外掛程式
 Comment[zh_TW]=更名對話盒的外掛程式
 Comment[zu]=I-plugin Yengxoxo Yokuqamba kabusha
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kurifilterplugin.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kurifilterplugin.desktop
@@ -82,3 +82,4 @@
 Name[zh_HK]=增強功能的瀏覽外掛程式
 Name[zh_TW]=增強的瀏覽外掛程式
 Name[zu]=I-plugin Yomcingi Weqophela eliphezulu
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kcomprfilter.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kcomprfilter.desktop
@@ -80,3 +80,4 @@
 Name[zh_HK]=KDE 壓縮過濾器
 Name[zh_TW]=KDE 壓縮過濾器
 Name[zu]=Ihluzo Lokunciphisa le-KDE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kpasswdserver.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kpasswdserver.desktop
@@ -155,3 +155,4 @@
 X-KDE-FactoryName=kpasswdserver
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -87,6 +87,8 @@
 	../kdeui/libkdeui.la ../kdesu/libkdesu.la \
 	../kwallet/client/libkwalletclient.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
 	$(am__DEPENDENCIES_1)
 am_libkio_la_OBJECTS = dummy.lo
 #>- libkio_la_OBJECTS = $(am_libkio_la_OBJECTS)
@@ -153,7 +155,6 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 1
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -167,6 +168,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -281,7 +284,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,6 +311,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -318,6 +321,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -346,6 +350,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -396,6 +401,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -453,6 +459,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -462,7 +469,8 @@
 xdg_menudir = @xdg_menudir@
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 INCLUDES = -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
-SUBDIRS = kssl kio bookmarks kfile . kpasswdserver misc pics tests kioexec httpfilter
+SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter
+DIST_SUBDIRS = kpasswdserver misc
 lib_LTLIBRARIES = libkio.la
 libkio_la_SOURCES = dummy.cpp
 libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
@@ -472,7 +480,7 @@
 	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
 	../kdeui/libkdeui.la ../kdesu/libkdesu.la \
 	../kwallet/client/libkwalletclient.la \
-	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS)
+	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
@@ -497,12 +505,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -513,8 +521,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -535,9 +543,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -800,7 +808,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1142,8 +1150,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kscan.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kscan.desktop
@@ -17,3 +17,4 @@
 Name[te]=కేస్కేన్
 Name[th]=สแกนภาพ - K
 Name[ven]=U nanga ha K
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kdatatool.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kdatatool.desktop
@@ -94,3 +94,4 @@
 
 [PropertyDef::ExcludeFrom]
 Type=QStringList
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kcmodule.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kcmodule.desktop
@@ -108,3 +108,4 @@
 ### KDE4 remove - this property is deprecated
 [PropertyDef::X-KDE-IsHiddenByDefault]
 Type=bool
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kfileplugin.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kfileplugin.desktop
@@ -86,3 +86,4 @@
 
 [PropertyDef::SupportsThumbnail]
 Type=bool
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/data.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/data.protocol
@@ -69,3 +69,4 @@
 URIMode=rawuri
 defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kssl/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kssl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -140,6 +140,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -282,6 +283,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -291,6 +293,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -319,6 +322,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -369,6 +373,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -426,6 +431,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -533,12 +539,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -549,8 +555,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -571,9 +577,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
 
 ksslconfig.h: stamp-h4
@@ -585,7 +591,7 @@
 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 $@
@@ -753,7 +759,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1105,8 +1111,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kssl/kssl/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kssl/kssl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -92,6 +92,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -206,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@
@@ -234,6 +235,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -243,6 +245,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -271,6 +274,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -321,6 +325,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -378,6 +383,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -393,12 +399,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -409,8 +415,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -431,9 +437,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:
@@ -534,7 +540,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -754,8 +760,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kssl/kssl/caroot/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kssl/kssl/caroot/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -372,12 +378,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -388,8 +394,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -410,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:
@@ -588,8 +594,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/rtsp.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/rtsp.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/rtspu.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/rtspu.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kio_uiserver.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kio_uiserver.desktop
@@ -98,3 +98,4 @@
 # It is a server
 X-DCOP-ServiceType=Unique
 X-KDE-StartupNotify=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kmailservice.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kmailservice.protocol
@@ -13,3 +13,4 @@
 Icon=mail_new
 Class=:internet
 URIMode=mailto
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -86,7 +86,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-#>- kio_uiserver_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kio_uiserver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 #>+ 1
 kio_uiserver_la_DEPENDENCIES = libkdeinit_kio_uiserver.la
 #>- am_kio_uiserver_la_OBJECTS = uiserver.lo
@@ -204,6 +206,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -318,7 +322,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@
@@ -346,6 +349,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -355,6 +359,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -383,6 +388,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -433,6 +439,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -490,6 +497,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -509,7 +517,7 @@
 #>+ 2
 kio_uiserver_la_SOURCES = kio_uiserver_la_dummy.cpp
 libkdeinit_kio_uiserver_la_SOURCES = uiserver.cpp   uiserver_skel.cpp observer_stub.cpp
-#>- kio_uiserver_la_LIBADD = $(LIB_KIO)
+#>- kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 #>+ 1
 kio_uiserver_la_LIBADD = libkdeinit_kio_uiserver.la
 kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -534,12 +542,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -550,8 +558,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -572,9 +580,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -849,7 +857,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1086,13 +1094,15 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kio_uiserver_la_LIBADD = $(LIB_KIO)
+libkdeinit_kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 
 #>+ 2
 libkdeinit_kio_uiserver_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kio_uiserver_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 4
+libkdeinit_kio_uiserver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_kio_uiserver_la_OBJECTS = uiserver.lo
@@ -1149,8 +1159,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/ssh.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/ssh.protocol
@@ -11,3 +11,4 @@
 deleting=false
 Icon=konsole
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/rtspt.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/rtspt.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/rlogin.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/rlogin.protocol
@@ -11,3 +11,4 @@
 deleting=false
 DocPath=kioslave/rlogin.html
 Icon=konsole
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/mms.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/mms.protocol
@@ -71,3 +71,4 @@
 Description[zh_HK]=Microsoft Media Server 協定
 Description[zh_TW]=Microsoft Media Server 協定
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/mmsu.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/mmsu.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/telnet.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/telnet.protocol
@@ -11,3 +11,4 @@
 deleting=false
 DocPath=kioslave/telnet.html
 Icon=konsole
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/pnm.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/pnm.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/mmst.protocol
+++ kdelibs-3.5.10.dfsg.1/kio/misc/mmst.protocol
@@ -13,3 +13,4 @@
 Icon=www
 Class=:internet
 URIMode=url
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kntlm/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kntlm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkntlm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkntlm_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkntlm_la_OBJECTS = kntlm.lo des.lo
 #>- libkntlm_la_OBJECTS = $(am_libkntlm_la_OBJECTS)
 #>+ 4
@@ -117,6 +117,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +260,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +270,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +299,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +350,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +408,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -417,19 +423,19 @@
 kntlminclude_HEADERS = kntlm.h
 libkntlm_la_SOURCES = kntlm.cpp des.cpp
 libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkntlm_la_LIBADD = $(LIB_KDECORE)
+libkntlm_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 #>- 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -440,8 +446,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -462,9 +468,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -554,7 +560,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -749,8 +755,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kfile/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kfile/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -108,6 +108,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -222,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@
@@ -250,6 +251,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -259,6 +261,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -287,6 +290,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -337,6 +341,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -394,6 +399,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,12 +419,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -429,8 +435,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -451,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
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -527,7 +533,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -719,8 +725,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kssld/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kssld/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,7 +81,9 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kded_kssld_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la \
+	$(top_builddir)/kded/libkdeinit_kded.la $(am__DEPENDENCIES_1)
 am_kded_kssld_la_OBJECTS = kssld.lo
 #>- kded_kssld_la_OBJECTS = $(am_kded_kssld_la_OBJECTS)
 #>+ 4
@@ -139,6 +141,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -253,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@
@@ -281,6 +284,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -290,6 +294,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -318,6 +323,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -368,6 +374,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -425,6 +432,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -435,7 +443,7 @@
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl $(all_includes)
 kde_module_LTLIBRARIES = kded_kssld.la
 kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
+kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la $(LIB_KDECORE)
 #>- kded_kssld_la_SOURCES = kssld.cpp kssld.skel
 #>+ 1
 kded_kssld_la_SOURCES=kssld.cpp  kssld_skel.cpp
@@ -449,12 +457,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -465,8 +473,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -487,9 +495,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -578,7 +586,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -799,8 +807,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kssld/kssld.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kssld/kssld.desktop
@@ -154,3 +154,4 @@
 Comment[zh_CN]=KDED 的 KSSL 守护进程模块
 Comment[zh_HK]=KDED 使用的 SSL 伺服程式模組
 Comment[zh_TW]=KDED 使用的 KSSL 伺服程式模組
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kdesasl/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kdesasl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,7 +61,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkdesasl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkdesasl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkdesasl_la_OBJECTS = kdesasl.lo
 #>- libkdesasl_la_OBJECTS = $(am_libkdesasl_la_OBJECTS)
 #>+ 1
@@ -115,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -415,19 +422,19 @@
 kdesaslinclude_HEADERS = kdesasl.h
 libkdesasl_la_SOURCES = kdesasl.cpp
 libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
-libkdesasl_la_LIBADD = $(LIB_KDECORE)
+libkdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 #>- 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -438,8 +445,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -460,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
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -551,7 +558,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -747,8 +754,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kpac/proxyscout.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kpac/proxyscout.desktop
@@ -129,3 +129,4 @@
 X-KDE-FactoryName=proxyscout
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kpac/eventsrc
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kpac/eventsrc
@@ -528,3 +528,5 @@
 Comment[zh_HK]=代理伺服器組態檔案執行錯誤
 Comment[zh_TW]=proxy 代理組態檔案執行錯誤
 default_presentation=0
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kpac/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kpac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -65,7 +65,10 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kded_proxyscout_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1)
+	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(top_builddir)/kded/libkdeinit_kded.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kded_proxyscout_la_OBJECTS = proxyscout.lo script.lo downloader.lo \
 	discovery.lo
 #>- kded_proxyscout_la_OBJECTS = $(am_kded_proxyscout_la_OBJECTS)
@@ -147,6 +150,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -261,7 +266,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,6 +293,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -298,6 +303,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -326,6 +332,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -376,6 +383,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -433,6 +441,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -453,7 +462,10 @@
                              downloader.cpp discovery.cpp proxyscout_skel.cpp
 
 kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED)
+kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
+	$(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la \
+	$(LIB_KDECORE) $(LIBRESOLV)
+
 kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
 kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
 kpac_dhcp_helper_LDFLAGS = $(KDE_USE_PIE)
@@ -469,12 +481,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -485,8 +497,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -507,9 +519,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -685,7 +697,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -896,22 +908,22 @@
 mocs: downloader.moc
 
 #>+ 3
-discovery.moc: $(srcdir)/discovery.h
-	$(MOC) $(srcdir)/discovery.h -o discovery.moc
+proxyscout.moc: $(srcdir)/proxyscout.h
+	$(MOC) $(srcdir)/proxyscout.h -o proxyscout.moc
 
 #>+ 2
-mocs: discovery.moc
+mocs: proxyscout.moc
 
 #>+ 3
-proxyscout.moc: $(srcdir)/proxyscout.h
-	$(MOC) $(srcdir)/proxyscout.h -o proxyscout.moc
+discovery.moc: $(srcdir)/discovery.h
+	$(MOC) $(srcdir)/discovery.h -o discovery.moc
 
 #>+ 2
-mocs: proxyscout.moc
+mocs: discovery.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  downloader.moc discovery.moc proxyscout.moc
+	-rm -f  downloader.moc proxyscout.moc discovery.moc
 
 #>+ 2
 KDE_DIST=eventsrc dhcp.h Makefile.in configure.in.in proxyscout.desktop kpactest.pac Makefile.am README.wpad 
@@ -929,8 +941,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -963,7 +975,7 @@
 
 
 #>+ 11
-kded_proxyscout_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/proxyscout.cpp $(srcdir)/script.cpp $(srcdir)/downloader.cpp $(srcdir)/discovery.cpp proxyscout_skel.cpp  downloader.moc proxyscout.moc discovery.moc
+kded_proxyscout_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/proxyscout.cpp $(srcdir)/script.cpp $(srcdir)/downloader.cpp $(srcdir)/discovery.cpp proxyscout_skel.cpp  downloader.moc discovery.moc proxyscout.moc
 	@echo 'creating kded_proxyscout_la.all_cpp.cpp ...'; \
 	rm -f kded_proxyscout_la.all_cpp.files kded_proxyscout_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kded_proxyscout_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/ksendbugmail/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/ksendbugmail/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -125,6 +125,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -267,6 +268,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -276,6 +278,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -304,6 +307,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -354,6 +358,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -411,6 +416,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -429,12 +435,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +451,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -544,7 +550,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -754,8 +760,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kwalletd/kwalletd.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kwalletd/kwalletd.desktop
@@ -149,3 +149,4 @@
 Comment[zh_CN]=KDED 的 KWallet 守护进程模块
 Comment[zh_HK]=KDED 的 KWallet 伺服程式模組
 Comment[zh_TW]=KDED 的 KWallet 服務程式模組
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/misc/kwalletd/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kwalletd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,7 +83,9 @@
 kded_kwalletd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../../../kwallet/backend/libkwalletbackend.la \
 	../../../kwallet/client/libkwalletclient.la \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kded/libkdeinit_kded.la
 am_kded_kwalletd_la_OBJECTS = kwalletd.lo ktimeout.lo
 #>- kded_kwalletd_la_OBJECTS = $(am_kded_kwalletd_la_OBJECTS)
 #>+ 4
@@ -141,6 +143,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -255,7 +259,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,6 +286,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -292,6 +296,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -320,6 +325,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -370,6 +376,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -427,6 +434,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -437,7 +445,7 @@
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes)
 kde_module_LTLIBRARIES = kded_kwalletd.la
 kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED)
+kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
 #>- kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
 #>+ 1
 kded_kwalletd_la_SOURCES=kwalletd.cpp  ktimeout.cpp   kwalletd_skel.cpp kwalletwizard.cpp kbetterthankdialogbase.cpp
@@ -451,12 +459,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -467,8 +475,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -489,9 +497,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -581,7 +589,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -818,8 +826,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -184,6 +184,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -298,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@
@@ -326,6 +327,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -335,6 +337,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -363,6 +366,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -413,6 +417,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -470,6 +475,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -588,12 +594,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -604,8 +610,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -626,9 +632,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:
@@ -814,7 +820,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1306,6 +1312,13 @@
 mocs: slaveconfig.moc
 
 #>+ 3
+kfilterbase.moc: $(srcdir)/kfilterbase.h
+	$(MOC) $(srcdir)/kfilterbase.h -o kfilterbase.moc
+
+#>+ 2
+mocs: kfilterbase.moc
+
+#>+ 3
 kurlcompletion.moc: $(srcdir)/kurlcompletion.h
 	$(MOC) $(srcdir)/kurlcompletion.h -o kurlcompletion.moc
 
@@ -1320,11 +1333,11 @@
 mocs: krun.moc
 
 #>+ 3
-kfilterbase.moc: $(srcdir)/kfilterbase.h
-	$(MOC) $(srcdir)/kfilterbase.h -o kfilterbase.moc
+netaccess.moc: $(srcdir)/netaccess.h
+	$(MOC) $(srcdir)/netaccess.h -o netaccess.moc
 
 #>+ 2
-mocs: kfilterbase.moc
+mocs: netaccess.moc
 
 #>+ 3
 knfsshare.moc: $(srcdir)/knfsshare.h
@@ -1334,13 +1347,6 @@
 mocs: knfsshare.moc
 
 #>+ 3
-netaccess.moc: $(srcdir)/netaccess.h
-	$(MOC) $(srcdir)/netaccess.h -o netaccess.moc
-
-#>+ 2
-mocs: netaccess.moc
-
-#>+ 3
 kdirlister_p.moc: $(srcdir)/kdirlister_p.h
 	$(MOC) $(srcdir)/kdirlister_p.h -o kdirlister_p.moc
 
@@ -1355,18 +1361,18 @@
 mocs: kdirwatch.moc
 
 #>+ 3
-sessiondata.moc: $(srcdir)/sessiondata.h
-	$(MOC) $(srcdir)/sessiondata.h -o sessiondata.moc
+ksambashare.moc: $(srcdir)/ksambashare.h
+	$(MOC) $(srcdir)/ksambashare.h -o ksambashare.moc
 
 #>+ 2
-mocs: sessiondata.moc
+mocs: ksambashare.moc
 
 #>+ 3
-ksambashare.moc: $(srcdir)/ksambashare.h
-	$(MOC) $(srcdir)/ksambashare.h -o ksambashare.moc
+sessiondata.moc: $(srcdir)/sessiondata.h
+	$(MOC) $(srcdir)/sessiondata.h -o sessiondata.moc
 
 #>+ 2
-mocs: ksambashare.moc
+mocs: sessiondata.moc
 
 #>+ 3
 kservice_p.moc: $(srcdir)/kservice_p.h
@@ -1390,18 +1396,18 @@
 mocs: renamedlg.moc
 
 #>+ 3
-kmimetypechooser.moc: $(srcdir)/kmimetypechooser.h
-	$(MOC) $(srcdir)/kmimetypechooser.h -o kmimetypechooser.moc
+slaveinterface.moc: $(srcdir)/slaveinterface.h
+	$(MOC) $(srcdir)/slaveinterface.h -o slaveinterface.moc
 
 #>+ 2
-mocs: kmimetypechooser.moc
+mocs: slaveinterface.moc
 
 #>+ 3
-slaveinterface.moc: $(srcdir)/slaveinterface.h
-	$(MOC) $(srcdir)/slaveinterface.h -o slaveinterface.moc
+kmimetypechooser.moc: $(srcdir)/kmimetypechooser.h
+	$(MOC) $(srcdir)/kmimetypechooser.h -o kmimetypechooser.moc
 
 #>+ 2
-mocs: slaveinterface.moc
+mocs: kmimetypechooser.moc
 
 #>+ 3
 kscan.moc: $(srcdir)/kscan.h
@@ -1419,7 +1425,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kdatatool.moc previewjob.moc kdirwatch_p.moc jobclasses.moc kmimetyperesolver.moc ktrader.moc slave.moc kshred.moc skipdlg.moc kurifilter.moc statusbarprogress.moc defaultprogress.moc davjob.moc progressbase.moc kfileshare.moc kautomount.moc forwardingslavebase.moc metainfojob.moc kshellcompletion.moc scheduler.moc chmodjob.moc connection.moc dataslave.moc kdirlister.moc observer.moc kfilemetainfo.moc slaveconfig.moc kurlcompletion.moc krun.moc kfilterbase.moc knfsshare.moc netaccess.moc kdirlister_p.moc kdirwatch.moc sessiondata.moc ksambashare.moc kservice_p.moc passdlg.moc renamedlg.moc kmimetypechooser.moc slaveinterface.moc kscan.moc pastedialog.moc
+	-rm -f  kdatatool.moc previewjob.moc kdirwatch_p.moc jobclasses.moc kmimetyperesolver.moc ktrader.moc slave.moc kshred.moc skipdlg.moc kurifilter.moc statusbarprogress.moc defaultprogress.moc davjob.moc progressbase.moc kfileshare.moc kautomount.moc forwardingslavebase.moc metainfojob.moc kshellcompletion.moc scheduler.moc chmodjob.moc connection.moc dataslave.moc kdirlister.moc observer.moc kfilemetainfo.moc slaveconfig.moc kfilterbase.moc kurlcompletion.moc krun.moc netaccess.moc knfsshare.moc kdirlister_p.moc kdirwatch.moc ksambashare.moc sessiondata.moc kservice_p.moc passdlg.moc renamedlg.moc slaveinterface.moc kmimetypechooser.moc kscan.moc pastedialog.moc
 
 #>+ 2
 KDE_DIST=lex.l Makefile.in configure.in.in klimitediodevice.h KFILEMETAINFO_ISSUES pastedialog.h yacc.y Makefile.am kservicegroupfactory.h 
@@ -1440,8 +1446,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1474,7 +1480,7 @@
 
 
 #>+ 11
-libkiocore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/authinfo.cpp $(srcdir)/kshred.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/slave.cpp $(srcdir)/slaveinterface.cpp $(srcdir)/sessiondata.cpp $(srcdir)/scheduler.cpp $(srcdir)/connection.cpp $(srcdir)/job.cpp $(srcdir)/global.cpp $(srcdir)/slaveconfig.cpp $(srcdir)/kurlpixmapprovider.cpp $(srcdir)/netaccess.cpp $(srcdir)/paste.cpp $(srcdir)/pastedialog.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/tcpslavebase.cpp $(srcdir)/slavebase.cpp $(srcdir)/passdlg.cpp $(srcdir)/forwardingslavebase.cpp $(srcdir)/progressbase.cpp $(srcdir)/defaultprogress.cpp $(srcdir)/statusbarprogress.cpp $(srcdir)/kdirnotify.cpp $(srcdir)/kdirnotify_stub.cpp $(srcdir)/observer.cpp $(srcdir)/kemailsettings.cpp $(srcdir)/kprotocolinfo.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp $(srcdir)/kremoteencoding.cpp $(srcdir)/kmimetypechooser.cpp observer_stub.cpp kdirnotify_skel.cpp uiserver_stub.cpp observer_skel.cpp  jobclasses.moc slave.moc skipdlg.moc kshred.moc statusbarprogress.moc defaultprogress.moc progressbase.moc forwardingslavebase.moc scheduler.moc connection.moc observer.moc slaveconfig.moc netaccess.moc sessiondata.moc passdlg.moc renamedlg.moc slaveinterface.moc kmimetypechooser.moc pastedialog.moc
+libkiocore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/authinfo.cpp $(srcdir)/kshred.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/slave.cpp $(srcdir)/slaveinterface.cpp $(srcdir)/sessiondata.cpp $(srcdir)/scheduler.cpp $(srcdir)/connection.cpp $(srcdir)/job.cpp $(srcdir)/global.cpp $(srcdir)/slaveconfig.cpp $(srcdir)/kurlpixmapprovider.cpp $(srcdir)/netaccess.cpp $(srcdir)/paste.cpp $(srcdir)/pastedialog.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/tcpslavebase.cpp $(srcdir)/slavebase.cpp $(srcdir)/passdlg.cpp $(srcdir)/forwardingslavebase.cpp $(srcdir)/progressbase.cpp $(srcdir)/defaultprogress.cpp $(srcdir)/statusbarprogress.cpp $(srcdir)/kdirnotify.cpp $(srcdir)/kdirnotify_stub.cpp $(srcdir)/observer.cpp $(srcdir)/kemailsettings.cpp $(srcdir)/kprotocolinfo.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp $(srcdir)/kremoteencoding.cpp $(srcdir)/kmimetypechooser.cpp observer_stub.cpp kdirnotify_skel.cpp uiserver_stub.cpp observer_skel.cpp  jobclasses.moc slave.moc skipdlg.moc kshred.moc statusbarprogress.moc defaultprogress.moc progressbase.moc forwardingslavebase.moc scheduler.moc connection.moc observer.moc slaveconfig.moc netaccess.moc sessiondata.moc passdlg.moc renamedlg.moc kmimetypechooser.moc slaveinterface.moc pastedialog.moc
 	@echo 'creating libkiocore_la.all_cpp.cpp ...'; \
 	rm -f libkiocore_la.all_cpp.files libkiocore_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkiocore_la.all_cpp.final; \
@@ -1486,7 +1492,7 @@
 	rm -f libkiocore_la.all_cpp.final libkiocore_la.all_cpp.files
 
 #>+ 11
-libksycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdirwatch.cpp $(srcdir)/kfileshare.cpp $(srcdir)/ksambashare.cpp $(srcdir)/knfsshare.cpp $(srcdir)/ktrader.cpp $(srcdir)/ktraderparse.cpp $(srcdir)/ktraderparsetree.cpp $(srcdir)/kservicetypefactory.cpp $(srcdir)/kservicetype.cpp $(srcdir)/kmimetype.cpp $(srcdir)/kservicegroup.cpp $(srcdir)/kservice.cpp $(srcdir)/kservicefactory.cpp $(srcdir)/kuserprofile.cpp $(srcdir)/kservicegroupfactory.cpp $(srcdir)/kurifilter.cpp $(srcdir)/kfilterbase.cpp $(srcdir)/kfilterdev.cpp $(srcdir)/kshellcompletion.cpp $(srcdir)/kurlcompletion.cpp $(srcdir)/kautomount.cpp $(srcdir)/krun.cpp $(srcdir)/kfileitem.cpp $(srcdir)/kdirlister.cpp $(srcdir)/kimageio.cpp $(srcdir)/chmodjob.cpp $(srcdir)/kscan.cpp $(srcdir)/kar.cpp $(srcdir)/ktar.cpp $(srcdir)/kzip.cpp $(srcdir)/previewjob.cpp $(srcdir)/metainfojob.cpp $(srcdir)/davjob.cpp $(srcdir)/kdatatool.cpp $(srcdir)/karchive.cpp $(srcdir)/kfilefilter.cpp $(srcdir)/kfilemetainfo.cpp $(srcdir)/kdcopservicestarter.cpp $(srcdir)/dataslave.cpp $(srcdir)/dataprotocol.cpp $(srcdir)/kacl.cpp $(srcdir)/posixacladdons.cpp  kdatatool.moc previewjob.moc kdirwatch_p.moc kmimetyperesolver.moc ktrader.moc kurifilter.moc davjob.moc kfileshare.moc kautomount.moc metainfojob.moc kshellcompletion.moc chmodjob.moc dataslave.moc kdirlister.moc kfilemetainfo.moc kurlcompletion.moc krun.moc kfilterbase.moc kdirlister_p.moc knfsshare.moc kdirwatch.moc kservice_p.moc ksambashare.moc kscan.moc
+libksycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdirwatch.cpp $(srcdir)/kfileshare.cpp $(srcdir)/ksambashare.cpp $(srcdir)/knfsshare.cpp $(srcdir)/ktrader.cpp $(srcdir)/ktraderparse.cpp $(srcdir)/ktraderparsetree.cpp $(srcdir)/kservicetypefactory.cpp $(srcdir)/kservicetype.cpp $(srcdir)/kmimetype.cpp $(srcdir)/kservicegroup.cpp $(srcdir)/kservice.cpp $(srcdir)/kservicefactory.cpp $(srcdir)/kuserprofile.cpp $(srcdir)/kservicegroupfactory.cpp $(srcdir)/kurifilter.cpp $(srcdir)/kfilterbase.cpp $(srcdir)/kfilterdev.cpp $(srcdir)/kshellcompletion.cpp $(srcdir)/kurlcompletion.cpp $(srcdir)/kautomount.cpp $(srcdir)/krun.cpp $(srcdir)/kfileitem.cpp $(srcdir)/kdirlister.cpp $(srcdir)/kimageio.cpp $(srcdir)/chmodjob.cpp $(srcdir)/kscan.cpp $(srcdir)/kar.cpp $(srcdir)/ktar.cpp $(srcdir)/kzip.cpp $(srcdir)/previewjob.cpp $(srcdir)/metainfojob.cpp $(srcdir)/davjob.cpp $(srcdir)/kdatatool.cpp $(srcdir)/karchive.cpp $(srcdir)/kfilefilter.cpp $(srcdir)/kfilemetainfo.cpp $(srcdir)/kdcopservicestarter.cpp $(srcdir)/dataslave.cpp $(srcdir)/dataprotocol.cpp $(srcdir)/kacl.cpp $(srcdir)/posixacladdons.cpp  kdatatool.moc previewjob.moc kdirwatch_p.moc kmimetyperesolver.moc ktrader.moc kurifilter.moc davjob.moc kfileshare.moc kautomount.moc metainfojob.moc kshellcompletion.moc chmodjob.moc dataslave.moc kdirlister.moc kfilemetainfo.moc kfilterbase.moc kurlcompletion.moc krun.moc kdirlister_p.moc knfsshare.moc kdirwatch.moc kservice_p.moc ksambashare.moc kscan.moc
 	@echo 'creating libksycoca_la.all_cpp.cpp ...'; \
 	rm -f libksycoca_la.all_cpp.files libksycoca_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libksycoca_la.all_cpp.final; \
@@ -1552,8 +1558,8 @@
 kfilemetainfo.o: kfilemetainfo.moc 
 $(srcdir)/slavebase.cpp: observer_stub.h uiserver_stub.h 
 kshellcompletion.lo: kshellcompletion.moc 
-kfilterbase.lo: kfilterbase.moc 
 krun.o: krun.moc 
+kfilterbase.lo: kfilterbase.moc 
 slaveconfig.lo: slaveconfig.moc 
 skipdlg.o: skipdlg.moc 
 $(srcdir)/connection.cpp: observer_stub.h uiserver_stub.h 
@@ -1621,8 +1627,8 @@
 forwardingslavebase.lo: forwardingslavebase.moc 
 metainfojob.o: metainfojob.moc 
 kurlcompletion.o: kurlcompletion.moc 
-observer.lo: observer.moc 
 knfsshare.o: knfsshare.moc 
+observer.lo: observer.moc 
 kshellcompletion.o: kshellcompletion.moc 
 dataslave.lo: dataslave.moc 
 $(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h 
--- kdelibs-3.5.10.dfsg.1.orig/kio/pics/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/pics/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -362,12 +368,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -378,8 +384,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -400,9 +406,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:
@@ -569,8 +575,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/httpfilter/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/httpfilter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -103,6 +103,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -217,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@
@@ -245,6 +246,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -254,6 +256,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -282,6 +285,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -332,6 +336,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -389,6 +394,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -408,12 +414,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -424,8 +430,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -446,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:
@@ -502,7 +508,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -796,8 +802,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kpasswdserver/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kpasswdserver/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -64,7 +64,10 @@
 am__DEPENDENCIES_1 =
 kded_kpasswdserver_la_DEPENDENCIES =  \
 	$(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kded/libkdeinit_kded.la
 am_kded_kpasswdserver_la_OBJECTS = kpasswdserver.lo
 #>- kded_kpasswdserver_la_OBJECTS = $(am_kded_kpasswdserver_la_OBJECTS)
 #>+ 4
@@ -119,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -261,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -421,19 +430,19 @@
 kded_kpasswdserver_la_SOURCES=kpasswdserver.cpp   kpasswdserver_skel.cpp
 #>- kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
 #>- all: all-am
 #>+ 1
 all: docs-am  all-am
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -540,7 +549,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -853,8 +862,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kfile/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kfile/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -153,6 +153,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -267,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@
@@ -295,6 +296,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -304,6 +306,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -332,6 +335,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -382,6 +386,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -439,6 +444,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -514,12 +520,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -530,8 +536,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -552,9 +558,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:
@@ -677,7 +683,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1034,18 +1040,18 @@
 mocs: kdiskfreesp.moc
 
 #>+ 3
-kfileview.moc: $(srcdir)/kfileview.h
-	$(MOC) $(srcdir)/kfileview.h -o kfileview.moc
+kfileiconview.moc: $(srcdir)/kfileiconview.h
+	$(MOC) $(srcdir)/kfileiconview.h -o kfileiconview.moc
 
 #>+ 2
-mocs: kfileview.moc
+mocs: kfileiconview.moc
 
 #>+ 3
-kfileiconview.moc: $(srcdir)/kfileiconview.h
-	$(MOC) $(srcdir)/kfileiconview.h -o kfileiconview.moc
+kfileview.moc: $(srcdir)/kfileview.h
+	$(MOC) $(srcdir)/kfileview.h -o kfileview.moc
 
 #>+ 2
-mocs: kfileiconview.moc
+mocs: kfileview.moc
 
 #>+ 3
 kfilespeedbar.moc: $(srcdir)/kfilespeedbar.h
@@ -1210,7 +1216,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kpreviewprops.moc kurlbar.moc knotifydialog.moc kimagefilepreview.moc kurlrequester.moc kfiletreeview.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileview.moc kfileiconview.moc kfilespeedbar.moc kfilefiltercombo.moc kpropertiesdialog.moc kurlcombobox.moc kfiledialog.moc kacleditwidget_p.moc kfiledetailview.moc kpreviewwidgetbase.moc kencodingfiledialog.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc
+	-rm -f  kpreviewprops.moc kurlbar.moc knotifydialog.moc kimagefilepreview.moc kurlrequester.moc kfiletreeview.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileiconview.moc kfileview.moc kfilespeedbar.moc kfilefiltercombo.moc kpropertiesdialog.moc kurlcombobox.moc kfiledialog.moc kacleditwidget_p.moc kfiledetailview.moc kpreviewwidgetbase.moc kencodingfiledialog.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc
 
 #>+ 2
 KDE_DIST=Makefile.in kpropsdlgplugin.desktop kpropertiesmimetypebase.ui kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui kfilemetapreview.h knotifywidgetbase.ui Makefile.am 
@@ -1231,8 +1237,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1265,7 +1271,7 @@
 
 
 #>+ 11
-libkfile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfilefiltercombo.cpp $(srcdir)/kfileview.cpp $(srcdir)/kfileiconview.cpp $(srcdir)/krecentdocument.cpp $(srcdir)/kfiledialog.cpp $(srcdir)/kdiroperator.cpp $(srcdir)/kfiledetailview.cpp $(srcdir)/kcombiview.cpp $(srcdir)/kurlrequester.cpp $(srcdir)/kfilepreview.cpp $(srcdir)/kurlcombobox.cpp $(srcdir)/kurlrequesterdlg.cpp $(srcdir)/kopenwith.cpp $(srcdir)/kpropertiesdialog.cpp $(srcdir)/kicondialog.cpp $(srcdir)/kdirsize.cpp $(srcdir)/krecentdirs.cpp $(srcdir)/kdiskfreesp.cpp $(srcdir)/kimagefilepreview.cpp $(srcdir)/kfilesharedlg.cpp $(srcdir)/kurlbar.cpp $(srcdir)/kmetaprops.cpp $(srcdir)/kpreviewprops.cpp $(srcdir)/kfiletreeview.cpp $(srcdir)/kfiletreeviewitem.cpp $(srcdir)/kfiletreebranch.cpp $(srcdir)/kdirselectdialog.cpp $(srcdir)/kfilebookmarkhandler.cpp $(srcdir)/kfilemetainfowidget.cpp $(srcdir)/kcustommenueditor.cpp $(srcdir)/knotifydialog.cpp $(srcdir)/kfilespeedbar.cpp $(srcdir)/kpreviewwidgetbase.cpp $(srcdir)/kfilemetapreview.cpp $(srcdir)/kencodingfiledialog.cpp $(srcdir)/kacleditwidget.cpp knotifywidgetbase.cpp kpropertiesdesktopbase.cpp kpropertiesdesktopadvbase.cpp kpropertiesmimetypebase.cpp  kpreviewprops.moc knotifydialog.moc kurlbar.moc kimagefilepreview.moc kfiletreeview.moc kurlrequester.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileview.moc kfileiconview.moc kfilespeedbar.moc kfilefiltercombo.moc kurlcombobox.moc kpropertiesdialog.moc kfiledialog.moc knotifywidgetbase.moc kacleditwidget_p.moc kfiledetailview.moc kencodingfiledialog.moc kpreviewwidgetbase.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kpropertiesdesktopadvbase.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kpropertiesmimetypebase.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc kpropertiesdesktopbase.moc
+libkfile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfilefiltercombo.cpp $(srcdir)/kfileview.cpp $(srcdir)/kfileiconview.cpp $(srcdir)/krecentdocument.cpp $(srcdir)/kfiledialog.cpp $(srcdir)/kdiroperator.cpp $(srcdir)/kfiledetailview.cpp $(srcdir)/kcombiview.cpp $(srcdir)/kurlrequester.cpp $(srcdir)/kfilepreview.cpp $(srcdir)/kurlcombobox.cpp $(srcdir)/kurlrequesterdlg.cpp $(srcdir)/kopenwith.cpp $(srcdir)/kpropertiesdialog.cpp $(srcdir)/kicondialog.cpp $(srcdir)/kdirsize.cpp $(srcdir)/krecentdirs.cpp $(srcdir)/kdiskfreesp.cpp $(srcdir)/kimagefilepreview.cpp $(srcdir)/kfilesharedlg.cpp $(srcdir)/kurlbar.cpp $(srcdir)/kmetaprops.cpp $(srcdir)/kpreviewprops.cpp $(srcdir)/kfiletreeview.cpp $(srcdir)/kfiletreeviewitem.cpp $(srcdir)/kfiletreebranch.cpp $(srcdir)/kdirselectdialog.cpp $(srcdir)/kfilebookmarkhandler.cpp $(srcdir)/kfilemetainfowidget.cpp $(srcdir)/kcustommenueditor.cpp $(srcdir)/knotifydialog.cpp $(srcdir)/kfilespeedbar.cpp $(srcdir)/kpreviewwidgetbase.cpp $(srcdir)/kfilemetapreview.cpp $(srcdir)/kencodingfiledialog.cpp $(srcdir)/kacleditwidget.cpp knotifywidgetbase.cpp kpropertiesdesktopbase.cpp kpropertiesdesktopadvbase.cpp kpropertiesmimetypebase.cpp  kpreviewprops.moc knotifydialog.moc kurlbar.moc kimagefilepreview.moc kfiletreeview.moc kurlrequester.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileiconview.moc kfileview.moc kfilespeedbar.moc kfilefiltercombo.moc kurlcombobox.moc kpropertiesdialog.moc kfiledialog.moc knotifywidgetbase.moc kacleditwidget_p.moc kfiledetailview.moc kencodingfiledialog.moc kpreviewwidgetbase.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kpropertiesdesktopadvbase.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kpropertiesmimetypebase.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc kpropertiesdesktopbase.moc
 	@echo 'creating libkfile_la.all_cpp.cpp ...'; \
 	rm -f libkfile_la.all_cpp.files libkfile_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/kfile/kpropsdlgplugin.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/kfile/kpropsdlgplugin.desktop
@@ -85,3 +85,4 @@
 
 [PropertyDef::X-KDE-Protocol]
 Type=QString
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kfile/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kfile/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -170,6 +170,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -284,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@
@@ -312,6 +313,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -321,6 +323,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -349,6 +352,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -399,6 +403,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -456,6 +461,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -483,12 +489,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -499,8 +505,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -521,9 +527,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:
@@ -605,7 +611,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -815,8 +821,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/bookmarks/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/bookmarks/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -136,6 +136,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -250,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@
@@ -278,6 +279,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -287,6 +289,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -315,6 +318,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -365,6 +369,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -422,6 +427,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -460,12 +466,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -476,8 +482,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -498,9 +504,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:
@@ -583,7 +589,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -960,8 +966,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -363,6 +363,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -477,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@
@@ -505,6 +506,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -514,6 +516,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -542,6 +545,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -592,6 +596,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -649,6 +654,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -702,12 +708,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -718,8 +724,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -740,9 +746,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:
@@ -959,7 +965,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1002,7 +1008,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -1013,7 +1019,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -1025,7 +1031,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -1039,23 +1045,36 @@
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -1249,18 +1268,18 @@
 mocs: kdirlistertest.moc
 
 #>+ 3
-jobtest.moc: $(srcdir)/jobtest.h
-	$(MOC) $(srcdir)/jobtest.h -o jobtest.moc
+kruntest.moc: $(srcdir)/kruntest.h
+	$(MOC) $(srcdir)/kruntest.h -o kruntest.moc
 
 #>+ 2
-mocs: jobtest.moc
+mocs: kruntest.moc
 
 #>+ 3
-kruntest.moc: $(srcdir)/kruntest.h
-	$(MOC) $(srcdir)/kruntest.h -o kruntest.moc
+jobtest.moc: $(srcdir)/jobtest.h
+	$(MOC) $(srcdir)/jobtest.h -o jobtest.moc
 
 #>+ 2
-mocs: kruntest.moc
+mocs: jobtest.moc
 
 #>+ 3
 kdirwatchtest.moc: $(srcdir)/kdirwatchtest.h
@@ -1306,7 +1325,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kdcopcheck.moc kdirlistertest.moc jobtest.moc kruntest.moc kdirwatchtest.moc kdirwatchunittest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
+	-rm -f  kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kdirwatchunittest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
 
 #>+ 2
 KDE_DIST=kdirwatchtest.h dummymeta.desktop kacltest.h Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kdirwatchunittest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am 
@@ -1319,8 +1338,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kio/tests/dummymeta.desktop
+++ kdelibs-3.5.10.dfsg.1/kio/tests/dummymeta.desktop
@@ -52,3 +52,4 @@
 X-KDE-Library=dummymeta
 MimeType=text/plain
 PreferredItems=Author,Title,Date
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kio/kioexec/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kio/kioexec/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -108,6 +108,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -222,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@
@@ -250,6 +251,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -259,6 +261,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -287,6 +290,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -337,6 +341,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -394,6 +399,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,12 +419,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -429,8 +435,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -451,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
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -527,7 +533,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -830,8 +836,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/pics/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/pics/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -58,7 +58,7 @@
 #>+ 1
 ksvgtopng_OBJECTS = ksvgtopng.$(OBJEXT)
 am__DEPENDENCIES_1 =
-ksvgtopng_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ksvgtopng_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kdecore/svgicons/libkdesvgicons.la
 #>- ksvgtopng_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 #>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -125,6 +125,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -267,6 +268,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -276,6 +278,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -304,6 +307,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -354,6 +358,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -411,6 +416,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -422,7 +428,7 @@
 INCLUDES = $(LIBART_CFLAGS) -I$(top_srcdir)/kdecore/svgicons -I$(top_srcdir)/kdefx $(all_includes)
 @include_SVGICONS_TRUE@KSVGTOPNG = ksvgtopng
 ksvgtopng_SOURCES = ksvgtopng.cpp
-ksvgtopng_LDADD = $(LIBART_LIBS) $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la
+ksvgtopng_LDADD = $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la
 ksvgtopng_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 #>- all: all-recursive
 #>+ 1
@@ -430,12 +436,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -446,8 +452,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -468,9 +474,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -614,7 +620,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -835,7 +841,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=Makefile.in LICENSE.crystalsvg Makefile.am 
+KDE_DIST=LICENSE.crystalsvg Makefile.in Makefile.am 
 
 #>+ 2
 docs-am:
@@ -845,8 +851,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/pics/crystalsvg/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/pics/crystalsvg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -373,12 +379,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -389,8 +395,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -411,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:
@@ -601,3920 +607,3920 @@
 .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 cr32-key_enter.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 crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-math_lsub.png cr16-action-history.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png crsc-mime-zip.svgz cr16-action-about_kde.png cr48-action-rotate_ccw.png cr32-action-mail_post_to.png cr16-mime-tar.png cr16-device-hdd_mount.png cr64-mime-exec_wine.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 crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-action-text_block.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 cr16-action-help.png crsc-device-print_class.svgz cr64-mime-html.png cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr22-action-music_quarternote.png cr16-device-3floppy_mount.png cr16-filesys-folder_important.png cr16-filesys-folder_grey.png cr64-device-smart_media_mount.png cr48-mime-source_o.png cr32-device-cdwriter_unmount.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr22-action-thumbnail.png cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr16-mime-postscript.png cr32-filesys-desktop.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 cr16-action-save_all.png cr64-mime-gf.png cr64-mime-video.png cr128-mime-metafont.png cr48-mime-txt.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 cr22-mime-info.png cr32-action-bookmark_folder.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr48-action-reload_page.png cr128-mime-source_f.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-fileopen.png cr16-action-player_end.png cr48-mime-source_moc.png cr128-app-password.png cr64-mime-source_php.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 cr22-action-pencil.png cr128-mime-pdf.png cr16-action-text_center.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png cr16-action-eraser.png cr128-mime-font.png crsc-device-hdd_unmount.svgz cr22-action-filenew.png cr16-action-fileprint.png cr32-action-music_sixteenthnote.png cr16-action-view_remove.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 crsc-mime-karbon_karbon.svgz cr22-action-blend.png cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr64-mime-dvi.png cr16-action-lock.png cr22-action-music_halfnote.png cr22-mime-bt.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr64-mime-man.png cr22-action-translate.png cr32-action-down.png cr22-mime-source_j.png cr48-filesys-folder_print.png cr16-action-blend.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 cr48-filesys-folder_yellow.png cr22-action-project_open.png cr16-filesys-folder_locked.png cr128-mime-wordprocessing.png cr64-mime-txt2.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr22-action-music_dottednote.png cr128-mime-readme.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr22-mime-kword_kwd.png cr16-filesys-folder_yellow.png cr32-mime-txt2.png crsc-mime-source_s.svgz cr22-action-mail_reply.png cr32-device-usbpendrive_mount.png cr16-mime-core.png cr128-mime-resource.png cr16-filesys-folder_orange_open.png cr32-action-stop.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 cr32-device-blockdevice.png cr16-action-viewmag+.png cr48-mime-man.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 crsc-mime-pk.svgz cr32-action-exit.png 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 cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-action-reload.png cr16-mime-rpm.png cr64-mime-readme.png cr16-filesys-folder.png cr22-mime-rpm.png cr64-device-zip_mount.png crsc-app-kttsd.svgz cr48-app-kmenu.png cr32-mime-video.png cr32-mime-document.png cr128-filesys-folder_home2.png cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr22-action-switchuser.png cr16-mime-exec_wine.png cr48-filesys-www.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr128-mime-exec_wine.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.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 cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.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 cr22-mime-source_p.png cr16-action-music_sixteenthnote.png cr32-action-blend.png cr128-filesys-folder_red.png cr48-action-gear.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 cr64-filesys-folder_important.png crsc-mime-shellscript.svgz crsc-filesys-folder_yellow_open.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr64-mime-source_c.png cr128-device-chardevice.png cr32-action-math_lsub.png cr16-action-music_quarternote.png crsc-mime-vcard.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz crsc-mime-font_bitmap.svgz cr64-mime-font_type1.png cr16-device-memory_stick_mount.png cr16-action-edittrash.png cr16-action-rotate.png cr16-action-connect_no.png cr22-action-about_kde.png cr16-action-frame_query.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr32-mime-kugar_kud.png cr32-mime-source.png cr32-action-math_paren.png cr22-filesys-folder_green_open.png cr128-mime-source_j.png cr32-action-math_rsub.png cr128-filesys-exec.png cr22-action-view_fit_width.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 cr16-action-back.png cr48-mime-karbon_karbon.png cr128-filesys-folder_txt.png crsc-mime-tgz.svgz crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr64-action-fileopen.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-filesys-network.png cr32-action-player_pause.png cr16-mime-tgz.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 cr32-action-rotate_cw.png cr16-action-editcopy.png cr22-action-music_eightnote.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr48-mime-source_cpp.png cr32-action-gohome.png cr16-mime-source_py.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 cr32-device-3floppy_unmount.png cr22-action-player_start.png cr32-action-filesaveas.png cr32-mime-gettext.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz 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-action-editcopy.png cr32-filesys-link_overlay.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr48-action-eraser.png cr64-mime-pk.png cr16-filesys-folder_favorite.png crsc-device-memory.svgz cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr32-action-contexthelp.png cr22-action-view_fit_height.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr16-action-math_brace.png cr22-mime-vcalendar.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png crsc-action-filequickprint.svgz cr16-action-view_sidetree.png cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr128-mime-cdtrack.png cr32-action-viewmag-.png cr16-mime-txt2.png cr16-mime-binary.png cr16-mime-kchart_chrt.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr32-action-mail_new.png cr16-filesys-folder_violet_open.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr48-mime-midi.png cr64-device-cdwriter_mount.png cr32-mime-kformula_kfo.png cr48-mime-font.png cr64-device-system.png cr22-action-add.png cr16-mime-font.png cr22-action-view_right.png crsc-device-smartmedia_mount.svgz cr64-mime-document.png cr128-mime-tgz.png cr128-filesys-folder_grey_open.png cr22-mime-document.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 cr22-action-player_stop.png cr32-action-connect_creating.png cr22-filesys-folder_red_open.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr64-mime-koffice.png cr128-mime-kexi_kexi.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr16-action-find.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-mail_reply.png cr32-action-wizard.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 cr128-filesys-network.png crsc-mime-message.svgz crsc-device-compact_flash_unmount.svgz cr32-action-mail_find.png cr16-action-math_brackets.png cr48-filesys-folder_green_open.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr22-action-move.png cr48-mime-soffice.png cr16-action-no.png cr22-device-sd_mmc_mount.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr22-action-message_reply.png cr16-action-fork.png cr128-mime-postscript.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png crsc-action-reload_page.svgz cr16-action-connect_creating.png crsc-action-about_kde.svgz cr16-action-window_new.png crsc-mime-man.svgz crsc-action-add.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr128-mime-karbon_karbon.png cr64-mime-kivio_flw.png cr48-filesys-folder_important.png cr48-filesys-network_local.png cr48-filesys-exec.png cr48-mime-kword_kwd.png cr32-action-math_prod.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 cr22-action-mail_new.png cr32-mime-cdr.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png crsc-action-player_pause.svgz cr16-filesys-folder_grey_open.png cr128-device-memory_stick_mount.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png crsc-action-player_next.svgz cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.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 cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr32-action-view_fit_height.png cr22-action-colorpicker.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr48-mime-source.png cr22-action-math_rsup.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 crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-filequickprint.png cr22-action-showmenu.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png crsc-mime-applix.svgz cr64-mime-resource.png cr32-device-sd_mmc_mount.png cr16-action-text_sub.png cr64-mime-log.png cr16-action-window_suppressed.png cr48-filesys-folder_green.png cr22-action-color_fill.png cr48-filesys-folder_violet_open.png cr32-filesys-folder_favorite.png cr22-action-math_frac.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 cr22-action-filefind.png cr64-filesys-folder_locked.png cr64-device-hdd_mount.png cr32-action-view_tree.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png cr32-filesys-folder_grey_open.png cr32-action-math_matrix.png cr48-device-scanner.png cr128-mime-dvi.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.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-action-indent.png cr32-device-compact_flash_unmount.png cr128-mime-document2.png crsc-mime-recycled.svgz cr16-action-bookmark.png cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr32-action-top.png cr16-action-kde5.png cr48-device-cdwriter_unmount.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr16-device-usbpendrive_unmount.png cr22-action-frame_chart.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr22-mime-koffice.png cr16-action-frame_spreadsheet.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png crsc-device-blockdevice.svgz cr22-action-reload3.png cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr32-device-5floppy_mount.png cr22-device-compact_flash_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png crsc-filesys-folder_man2.svgz cr16-action-tab_remove.png cr48-mime-kugar_kud.png cr22-action-mouse.png crsc-app-kmenu.svgz crsc-mime-source_java.svgz cr22-mime-source_java.png 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 crsc-mime-source_p.svgz cr32-action-player_end.png crsc-filesys-folder_orange_open.svgz cr32-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr32-mime-binary.png cr22-action-spellcheck.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr48-action-rotate.png cr16-action-tab_new.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.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 cr32-key_enter.png crsc-action-player_rew.svgz cr128-filesys-file_broken.png cr16-action-wizard.png crsc-filesys-folder_sound.svgz cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr32-mime-vcard.png cr48-device-chardevice.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-action-exit.svgz crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.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 crsc-mime-txt2.svgz cr16-action-services.png cr64-device-mo_mount.png cr22-action-mail_replylist.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr32-action-player_fwd.png cr64-mime-source_h.png cr22-mime-source_s.png cr64-filesys-network_local.png cr48-mime-log.png cr22-action-rebuild.png cr48-action-lock.png cr32-device-print_class.png cr22-action-unlock.png cr32-action-edittrash.png cr22-action-save_all.png crsc-action-fileclose.svgz cr32-action-view_fit_window.png cr16-device-print_class.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 cr16-action-frame_image.png cr64-device-camera_unmount.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 cr16-mime-source_pl.png cr22-mime-wordprocessing.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 cr128-filesys-folder_yellow_open.png cr16-action-mail_replyall.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr16-action-fileimport.png cr32-action-connect_established.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png crsc-filesys-folder_important.svgz cr22-action-bookmark_folder.png cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr16-filesys-folder_home.png cr32-action-help.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 cr48-mime-metafont.png crsc-filesys-pipe.svgz 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 cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-ipod_mount.png cr32-action-view_right.png cr64-device-3floppy_unmount.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr16-mime-shellscript.png cr32-action-view_multicolumn.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 cr22-action-player_play.png cr32-action-revert.png cr48-device-zip_mount.png cr48-action-remove.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.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 cr64-device-5floppy_unmount.png cr16-action-player_volume.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 cr16-action-info.png cr64-mime-rpm.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 cr32-filesys-network_local.png cr22-mime-netscape_doc.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-action-misc.png cr48-mime-source_p.png crsc-mime-source_h.svgz cr32-mime-zip.png cr128-app-kmenu.png cr48-device-camera_unmount.png cr16-mime-resource.png cr128-filesys-lock_overlay.png cr16-action-editpaste.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_txt.png cr48-filesys-folder_home.png cr48-device-compact_flash_mount.png cr16-action-mail_get.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr32-action-identity.png cr16-action-color_line.png cr16-mime-cdtrack.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 cr16-device-pda_blue.png cr22-action-text_bold.png cr32-action-text_super.png cr22-action-remove.png cr128-mime-source_o.png cr32-device-compact_flash_mount.png crsc-mime-readme.svgz cr64-mime-source_f.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr128-device-printer1.png cr48-action-forward.png cr22-filesys-folder_orange.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr128-device-smart_media_mount.png cr32-app-password.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr16-action-view_fit_height.png crsc-mime-deb.svgz cr128-filesys-folder_man.png cr22-action-contents.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png crsc-action-wizard.svgz cr22-action-text_strike.png cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-mime-message.png cr22-action-music_flat.png cr128-filesys-folder_image.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr48-mime-deb.png cr64-filesys-folder_favorite.png cr32-mime-source_java.png cr16-mime-bt.png cr22-action-music_natur.png cr128-filesys-folder_locked.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 crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr16-action-view_fit_window.png cr128-device-ipod_mount.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-fileprint.png cr22-action-cd.png cr22-mime-source_pl.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr16-action-inline_image.png cr48-action-stop.png cr64-filesys-file_broken.png cr16-filesys-network_local.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr16-action-colorpicker.png cr22-action-previous.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 crsc-action-player_eject.svgz cr32-action-view_text.png 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 cr48-mime-kpresenter_kpr.png cr16-action-tab_breakoff.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 cr16-action-ok.png cr32-filesys-folder_open.png cr64-mime-source_s.png cr22-action-apply.png cr16-filesys-folder_txt.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 cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr64-filesys-folder_violet_open.png crsc-mime-kexi_kexi.svgz cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr32-mime-source_f.png cr16-action-contexthelp.png cr22-action-editdelete.png cr16-action-editshred.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png cr22-action-eraser.png cr128-mime-zip.png crsc-device-3floppy_unmount.svgz cr48-device-5floppy_unmount.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr22-action-player_pause.png cr48-app-password.png crsc-mime-font_type1.svgz cr128-filesys-folder_html.png crsc-device-nfs_unmount.svgz cr22-action-contents2.png crsc-mime-soffice.svgz cr22-action-gohome.png cr48-mime-quicktime.png cr22-mime-source_h.png cr16-mime-man.png cr48-device-cdaudio_unmount.png cr22-action-forward.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-action-tab_new_raised.png cr16-mime-kivio_flw.png cr16-mime-empty.png cr64-mime-image.png cr64-mime-spreadsheet.png crsc-device-3floppy_mount.svgz 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 cr32-action-reload_all_tabs.png crsc-mime-metafont.svgz cr48-filesys-folder_red_open.png cr64-device-joystick.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 cr64-device-memory_stick_mount.png cr22-action-history.png cr32-device-chardevice.png cr16-action-view_bottom.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr32-action-text_bold.png cr128-mime-koffice.png cr32-mime-bt.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png cr48-mime-make.png crsc-mime-spreadsheet.svgz cr128-mime-unknown.png cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr32-action-show_side_panel.png cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png cr16-action-text_super.png crsc-filesys-folder.svgz cr64-filesys-folder_open.png cr16-action-locationbar_erase.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr48-device-ipod_mount.png cr16-action-fileclose.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-action-math_lsub.png cr22-mime-applix.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr22-action-back.png cr64-device-memory.png cr32-filesys-folder_orange.png cr48-mime-source_j.png cr32-filesys-pipe.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png crsc-device-system.svgz cr22-action-view_bottom.png cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-bt.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-action-charset.png cr32-mime-source_p.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr16-filesys-folder_sound.png cr32-mime-source_php.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.png cr48-mime-binary.png cr32-mime-misc.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-frame_text.png cr16-action-clear_left.png cr32-action-filesave.png cr32-mime-tex.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png cr128-mime-image.png cr16-action-viewmag.png cr32-mime-midi.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-view_detailed.png cr22-action-music_fermatenote.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 cr16-device-cdaudio_mount.png cr22-filesys-network.png crsc-device-memory_stick_unmount.svgz cr22-action-text_left.png cr48-action-reload.png cr48-action-previous.png cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr22-action-player_playlist.png cr48-device-mo_unmount.png cr128-mime-cdr.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr64-mime-tgz.png cr32-action-run.png cr128-filesys-folder_open.png cr32-action-apply.png cr16-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-mime-ascii.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr22-action-misc.png crsc-action-player_stop.svgz cr32-action-fileclose.png cr22-action-text_under.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 cr16-mime-txt.png cr22-filesys-folder_violet.png crsc-filesys-folder_man.svgz cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr22-action-rightjust.png cr128-mime-soffice.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-inline_image.png cr22-action-compfile.png cr16-mime-gettext.png cr64-action-share.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.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 crsc-action-mail_get.svgz cr48-action-mail_new.png 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 cr22-action-color_line.png cr64-device-blockdevice.png cr16-mime-wordprocessing.png crsc-device-camera_unmount.svgz cr48-mime-shellscript.png cr128-mime-font_truetype.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 cr22-action-view_fit_window.png cr64-device-pda_black.png cr64-action-favorites.png cr16-action-configure_shortcuts.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-device-cdrom_unmount.png cr16-action-halfencrypted.png cr128-device-ipod_unmount.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png cr32-action-mouse.png crsc-filesys-exec_wine.svgz cr32-mime-postscript.png cr22-mime-kivio_flw.png cr32-device-memory.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 cr48-action-reload_all_tabs.png cr16-filesys-server.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 cr32-device-pda_blue.png cr16-device-blockdevice.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 cr16-device-mo_mount.png cr16-filesys-folder_crystal.png crsc-mime-document2.svgz cr22-action-player_end.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr64-mime-bt.png cr32-filesys-folder_yellow_open.png cr16-mime-message.png cr32-action-bookmark_toolbar.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr22-device-ipod_mount.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 cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.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 cr64-mime-vectorgfx.png cr22-mime-recycled.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png cr32-action-attach.png crsc-action-rotate_ccw.svgz cr32-action-exec.png cr22-mime-txt2.png crsc-mime-netscape_doc.svgz cr22-action-redo.png cr64-filesys-folder_violet.png cr16-filesys-folder_red_open.png cr64-mime-source_o.png cr22-action-filesave.png cr48-mime-misc.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png crsc-mime-html.svgz cr16-action-kde3.png cr128-filesys-folder_home.png cr32-action-compfile.png cr22-action-revert.png cr16-device-compact_flash_mount.png crsc-action-text_italic.svgz cr128-mime-info.png cr48-mime-exec_wine.png cr16-action-identity.png cr32-mime-source_y.png cr16-action-rotate_ccw.png cr22-action-connect_no.png cr32-device-nfs_unmount.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-player_start.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png crsc-mime-document.svgz cr64-mime-message.png cr16-action-decrypted.png cr22-action-identity.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr16-mime-ascii.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr32-device-tv.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 crsc-filesys-folder_tar.svgz cr32-action-mail_get.png 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 crsc-mime-source_pl.svgz cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr128-mime-colorscm.png cr16-action-run.png cr32-action-filter.png cr48-action-gohome.png cr22-action-rotate.png crsc-device-cdrom_unmount.svgz cr16-action-queue.png cr32-filesys-exec.png cr128-device-sd_mmc_unmount.png cr48-mime-tar.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr48-mime-vcalendar.png cr22-action-mail_get.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.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-filesys-folder_man.png cr16-action-stamp.png cr22-action-text_super.png cr32-action-folder_new.png cr16-action-mail_find.png cr64-mime-kugar_kud.png cr22-action-today.png cr22-action-button_ok.png cr128-mime-message.png cr16-action-bottom.png cr64-mime-font.png cr32-filesys-folder_tar.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr16-mime-source_moc.png cr48-mime-readme.png cr16-device-cdrom_mount.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 cr32-filesys-folder_sound.png crsc-action-contents2.svgz cr22-action-math_int.png cr128-filesys-folder_violet.png cr64-device-hdd_unmount.png cr32-filesys-lock_overlay.png cr64-mime-source_l.png cr32-mime-readme.png crsc-mime-binary.svgz cr48-action-launch.png crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr128-mime-gf.png cr22-action-viewmag.png cr16-filesys-folder_print.png cr128-mime-source_p.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr64-mime-source_p.png cr16-device-system.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 cr16-action-1leftarrow.png cr32-device-tablet.png cr22-action-editshred.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 cr32-mime-source_moc.png cr128-filesys-folder_sound.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 cr22-mime-encrypted.png cr16-device-mouse.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr22-action-next.png cr32-mime-unknown.png cr22-action-fileclose.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-player_rew.png cr16-action-fontsizedown.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr64-mime-karbon_karbon.png cr32-mime-font.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr32-action-view_remove.png cr16-mime-document.png cr16-action-text_italic.png cr128-filesys-desktop.png cr64-filesys-folder_green.png cr48-device-pda_black.png cr128-mime-video.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 cr16-action-tab_duplicate.png crsc-device-cdrom_mount.svgz cr22-action-frame_query.png cr32-mime-message.png cr22-action-clear_left.png crsc-action-mail_generic.svgz cr16-action-music_flat.png cr22-mime-font_truetype.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 cr22-action-idea.png cr48-device-system.png cr48-mime-font_bitmap.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr32-action-halfencrypted.png cr48-mime-mozilla_doc.png cr48-mime-dvi.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 cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-action-switchuser.png cr32-filesys-folder_man.png cr16-action-tab_remove_other.png cr16-action-colorize.png cr22-mime-tex.png crsc-mime-tex.svgz cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr22-mime-font.png crsc-mime-postscript.svgz cr64-mime-kspread_ksp.png cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr32-filesys-folder_crystal.png cr64-mime-source_cpp.png cr64-device-ipod_unmount.png cr32-action-signature.png cr22-action-text_sub.png cr128-device-hdd_mount.png cr128-mime-core.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 cr22-action-folder.png cr22-action-editpaste.png cr32-action-text_italic.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-project_open.png cr16-action-bookmark_folder.png cr128-filesys-folder_red_open.png cr32-device-camera_unmount.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png cr32-mime-cdtrack.png crsc-filesys-zip_overlay.svgz 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 cr128-filesys-folder_crystal.png cr64-mime-netscape_doc.png cr48-mime-source_java.png cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-applix.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 cr32-action-undo.png crsc-action-text_under.svgz cr16-filesys-pipe.png cr32-filesys-folder_print.png cr16-mime-zip.png cr48-action-next.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 cr22-action-show_side_panel.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png crsc-action-player_play.svgz cr64-mime-metafont.png 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 cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.png cr64-filesys-folder_man.png cr48-mime-source_py.png cr22-action-share.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 cr64-filesys-folder_image.png cr32-mime-quicktime.png cr32-device-smart_media_mount.png cr16-mime-unknown.png cr128-mime-mozilla_doc.png crsc-action-player_start.svgz cr16-mime-applix.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-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr16-filesys-link_overlay.png cr22-mime-source.png cr22-action-math_paren.png cr48-device-5floppy_mount.png cr64-device-dvd_unmount.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
 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
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_cw.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/finish.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan.svgz
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
-	$(INSTALL_DATA) $(srcdir)/cr64-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/cr16-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_eightnote.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pdf.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
-	$(INSTALL_DATA) $(srcdir)/crsc-action-finish.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_generic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
-	$(INSTALL_DATA) $(srcdir)/crsc-device-tablet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-	$(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_y.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcalendar.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/cr48-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
+	$(INSTALL_DATA) $(srcdir)/cr64-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kword_kwd.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-html.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/html.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_fwd.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-zip_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_j.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_type1.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+	$(INSTALL_DATA) $(srcdir)/cr22-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
+	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_mount.svgz
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_pl.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_pl.svgz
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
+	$(INSTALL_DATA) $(srcdir)/cr128-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/mouse.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
-	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
-	$(INSTALL_DATA) $(srcdir)/cr128-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/bt.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-metafont.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/metafont.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
-	$(INSTALL_DATA) $(srcdir)/cr64-action-favorites.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_creating.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1rightarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-vcalendar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_txt.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
+	$(INSTALL_DATA) $(srcdir)/crsc-action-filenew.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_broken.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_broken.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_all_tabs.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-blockdevice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/blockdevice.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-lock_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/cr22-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-completion.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
+	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_super.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-recycled.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
-	$(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-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
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/about_kde.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
-	$(INSTALL_DATA) $(srcdir)/cr128-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdr.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_cpp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_txt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-history_clear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history_clear.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_toolbars.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_toolbars.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-www.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_sound.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-lock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-trashcan_full.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_full.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/signature.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-news_unsubscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_unsubscribe.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pdf.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/karbon_karbon.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-	$(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
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/blockdevice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/queue.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-deb.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-desktop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+	$(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_fwd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+	$(INSTALL_DATA) $(srcdir)/cr48-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/video.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/airbrush.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/shellscript.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_new.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edittrash.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/lock.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gettext.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/remove.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-kmultiple.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_start.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-contents2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editshred.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/lock_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
-	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-up.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_pause.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_pause.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/metafont.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-vcard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/empty.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-mozilla_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-window_suppressed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_suppressed.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-	$(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-hdd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_l.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-scanner.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/eraser.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_start.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/scanner.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_add.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcut.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-top.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_red_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_bild.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-widget_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/widget_doc.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_generic.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/start.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-readme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/apply.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_crystal.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-wizard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-font.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_temporary.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdwriter_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_toolbar.png
 	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/undo.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_abs.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-fileprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileprint.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-reload_all_tabs.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_all_tabs.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_j.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-encrypted.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-transform.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_32ndnote.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-readme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-switchuser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-1downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/file_broken.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-deb.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/attach.png
 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-wordprocessing.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
-	$(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)/cr22-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.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
-	$(INSTALL_DATA) $(srcdir)/cr16-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-www.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-share.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/bt.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_new.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
-	$(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
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_italic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_nofullscreen.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_warning.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdrom_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/apply.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_php.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_bitmap.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
+	$(INSTALL_DATA) $(srcdir)/cr64-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdrom_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_py.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
 	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_center.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_critical.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_critical.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_get.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/unknown.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-desktop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_info.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_info.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filenew.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_toolbar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edittrash.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-news_unsubscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_unsubscribe.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/down.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-reload3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-1downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_under.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/widget_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-joystick.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_py.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-crop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/project_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-inline_table.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/www.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
 	$(INSTALL_DATA) $(srcdir)/crsc-device-dvd_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
 	$(INSTALL_DATA) $(srcdir)/cr22-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_pause.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_pause.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sum.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-thumbnail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_query.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-contents2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-gohome.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/gohome.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-usbpendrive_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/help.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_window.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-unknown.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
 	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_duplicate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_duplicate.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-fileopen.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_new.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-vcard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_post_to.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-device-hdd_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-reload_page.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmagfit.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_fullscreen.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdr.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_black.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-previous.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/bookmark.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new_raised.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_raised.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-flag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network_local.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
 	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/undo.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/compfile.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_strike.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-memory.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_type1.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
 	$(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-chardevice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/chardevice.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_cpp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/link_overlay.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdimage.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/back.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_bold.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bold.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/bt.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_fwd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rebuild.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_java.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-history_clear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history_clear.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-file_temporary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-device-nfs_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-trashcan_empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_j.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/netscape_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-5floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_favorite.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_truetype.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_truetype.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-frameprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/queue.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_italic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
 	$(INSTALL_DATA) $(srcdir)/cr48-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-postscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
-	$(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/ascii.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_remove.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcut.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-1leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/scanner.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-spreadsheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/binary.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sqrt.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-video.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/chardevice.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-about_kde.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/about_kde.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-history.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-fileclose.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-key_enter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/key_enter.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-temporary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/temporary.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/down.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange_open.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-zip_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_crystal.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileimport.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-filenew.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-postscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-nfs_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdtrack.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/cr22-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_width.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_eject.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_crystal.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tex.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/mozilla_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_dottednote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_java.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_find.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-usbpendrive_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_eject.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replyall.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-kexi_kexi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/revert.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/run.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/charset.png
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_yellow_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_moc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fullnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/move.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-switchuser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_php.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-reload_all_tabs.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_all_tabs.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_page.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-configure.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_stop.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_pause.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/charset.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/unlock.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pdf.png
 	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_java.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gear.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-inline_table.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-reload.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-news_unsubscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_unsubscribe.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-colorscm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/finish.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-widget_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/widget_doc.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_rew.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_p.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_bitmap.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/previous.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-reload_page.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/decrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-pdf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_bild.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-device-dvd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2downarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_pl.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/crsc-device-mouse.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mouse.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/wizard.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_sub.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_sub.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-binary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/binary.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_truetype.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-image2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_pl.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_pl.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/bookmark.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tar.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_rew.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_rew.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new_raised.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_raised.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_blue.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_php.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_folder.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_orange_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-tv.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tv.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_s.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
 	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_fill.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replylist.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_height.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
-	$(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-pk.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pk.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-device-nfs_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_text.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
 	$(INSTALL_DATA) $(srcdir)/cr22-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
-	$(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)/cr16-filesys-folder_sent_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tar.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_c.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.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
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-thumbnail.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/core.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-unknown.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/soffice.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-dvi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_java.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/about_kde.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_new.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_pause.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_bitmap.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_32ndnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_height.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/chardevice.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kformula_kfo.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_print.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmagfit.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-share.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2rightarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-top.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_red_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-up.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-vectorgfx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/link_overlay.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdimage.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/bt.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rebuild.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-koffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-down.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
 	$(INSTALL_DATA) $(srcdir)/cr48-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tar.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_temporary.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/previous.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_strike.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-tablet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileprint.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_folder.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_y.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-configure.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_bold.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bold.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_post_to.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network_local.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network_local.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-thumbnail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/www.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsub.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-lock_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
 	$(INSTALL_DATA) $(srcdir)/cr16-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-key_enter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/key_enter.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/cr32-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+	$(INSTALL_DATA) $(srcdir)/cr128-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1rightarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kspread_ksp.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-printer1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/printer1.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/applix.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-document2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document2.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-trashcan_empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green_open.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/next.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-tv.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tv.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-history.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_shortcuts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-finish.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-completion.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_py.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-pda_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_blue.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_end.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_all_tabs.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_blue.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sent_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tgz.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/link_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_top_bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-spreadsheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_important.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-applix.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-soffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kmultiple.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/binary.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/decrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/mozilla_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/applix.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-services.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-bottom.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/bottom.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-translate.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-crop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1uparrow.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
 	$(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/blend.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_multicolumn.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
-	$(INSTALL_DATA) $(srcdir)/cr64-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec_wine.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_warning.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tex.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdtrack.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_time.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_time.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-fileopen.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-services.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mouse.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-memory.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-zip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-pda_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_blue.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/about_kde.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_eightnote.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
 	$(INSTALL_DATA) $(srcdir)/crsc-mime-tex.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tex.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kchart_chrt.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filequickprint.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/karbon_karbon.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_s.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-action-indent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network_local.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network_local.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/queue.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
+	$(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_critical.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_critical.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/identity.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_nofullscreen.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-kugardata.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_locked.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-services.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fermatenote.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-fileprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileprint.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-file_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-message_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_type1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-print_class.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replyall.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/crsc-device-system.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-1leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-font.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-log.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/log.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_html.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
-	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/signature.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-shellscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/desktop.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-tgz.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tgz.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_favorite.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-inline_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_image.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-inline_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_breakoff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/up.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdtrack.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/empty.svgz
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-	$(INSTALL_DATA) $(srcdir)/cr128-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-reload3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/info.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/video.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-kmultiple.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_play.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kugar_kud.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_stop.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/file_broken.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/configure.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replyall.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr32-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/html.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_grey.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_grey.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-cd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cd.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editshred.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcopy.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
+	$(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-indent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sqrt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/bt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/previous.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-pda_black.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdr.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-log.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/log.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-hdd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/airbrush.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_breakoff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fermatenote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-wordprocessing.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/about_kde.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-pipe.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-chardevice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/chardevice.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_php.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
 	$(INSTALL_DATA) $(srcdir)/cr22-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-player_eject.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/goto.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_l.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsup.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_favorite.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_sound.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_truetype.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_image.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_no.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/forward.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tv.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-window_suppressed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_suppressed.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_y.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-video.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-applix.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
 	$(INSTALL_DATA) $(srcdir)/crsc-mime-netscape_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_full.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_chart.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-transform.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_black.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_left.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-printer1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/printer1.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filenew.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2downarrow.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_abs.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_empty.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-bottom.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/bottom.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-1leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_left_right.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_c.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_line.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_abs.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-crop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-button_cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_php.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home2.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/empty.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-rpm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-down.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-text_strike.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pk.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-sound.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
-	$(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-key_enter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/key_enter.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_left.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcard.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/joystick.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-kexi_kexi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-previous.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_shortcuts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/next.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-link_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-koffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_yellow.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-mozilla_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-5floppy_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcopy.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-message.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/message.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_php.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2rightarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/link_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
 	$(INSTALL_DATA) $(srcdir)/cr48-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/karbon_karbon.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_ccw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_ccw.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-translate.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pdf.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdr.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
-	$(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red_open.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_choose.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-zip_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_cpp.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileprint.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-cdwriter_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_toolbars.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_toolbars.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-forward.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_start.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_orange.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/link_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kspread_ksp.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
+	$(INSTALL_DATA) $(srcdir)/cr48-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/password.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/blockdevice.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-print_class.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/blend.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_top_bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-reload.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
 	$(INSTALL_DATA) $(srcdir)/crsc-device-cdwriter_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exit.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-vectorgfx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-cdrom_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-usbpendrive_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
 	$(INSTALL_DATA) $(srcdir)/cr64-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_home.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-button_cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_cancel.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-resource.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_mount.png
-	$(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
+	$(INSTALL_DATA) $(srcdir)/cr16-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/charset.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-indent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_super.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-zip_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_rew.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_rew.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-key_enter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/key_enter.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-dvi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_sub.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_sub.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-blockdevice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/blockdevice.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-fileclose.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/down.png
+	$(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tv.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sum.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-stamp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_py.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_under.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
 	$(INSTALL_DATA) $(srcdir)/cr22-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/eraser.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1uparrow.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-filequickprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-device-hdd_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmagfit.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_fullscreen.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-document2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document2.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/bt.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_l.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_abs.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exec.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-scanner.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_truetype.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_truetype.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fullnote.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
 	$(INSTALL_DATA) $(srcdir)/crsc-action-back.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_icon.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-encrypted.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_find.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network_local.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-soffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_height.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
 	$(INSTALL_DATA) $(srcdir)/cr128-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-document.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_dottednote.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-translate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-gf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/rpm.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_blue.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileprint.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cancel.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/www.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
-	$(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exec.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edittrash.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/printer1.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-eraser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new_bg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_bg.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/down.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_red.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red.svgz
-	$(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)/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
-	$(INSTALL_DATA) $(srcdir)/cr22-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove_other.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove_other.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-info.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/system.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-kdevelop_down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-pda_black.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_o.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsub.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
-	$(INSTALL_DATA) $(srcdir)/crsc-action-lock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-action-inline_table.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/netscape_doc.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filefind.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_orange.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/configure.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_multicolumn.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kword_kwd.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-button_cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
+	$(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/image.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsub.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange_open.png
-	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-thumbnail.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
-	$(INSTALL_DATA) $(srcdir)/cr128-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_type1.png
-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/finish.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-zip_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_ccw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_ccw.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_left_right.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-zip_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-info.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
 	$(INSTALL_DATA) $(srcdir)/cr64-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/joystick.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_creating.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-cd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cd.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/emptytrash.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
-	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_txt.png
-	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_moc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_chart.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-make.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/make.svgz
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+	$(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-file_temporary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-image2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/file_broken.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-eraser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/soffice.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/wizard.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
 	$(INSTALL_DATA) $(srcdir)/cr16-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_info.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_info.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/help.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_time.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_time.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsub.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/bt.png
 	$(INSTALL_DATA) $(srcdir)/cr48-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_mount.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-cdrom_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_unmount.svgz
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
-	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pdf.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-1downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_mount.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
-	$(INSTALL_DATA) $(srcdir)/cr16-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
-	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_s.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_f.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
-	$(INSTALL_DATA) $(srcdir)/cr64-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/mozilla_doc.png
-	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_h.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
-	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/deb.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/spellcheck.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
-	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-flag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/shellscript.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kchart_chrt.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cancel.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/forward.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_eject.png
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
-	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-resource.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/previous.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_p.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/spellcheck.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-document.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/move.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_favorite.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-inline_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-zip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
+	$(INSTALL_DATA) $(srcdir)/cr64-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-inline_table.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/joystick.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kmultiple.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-pk.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pk.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/emptytrash.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gear.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-crop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_java.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-tgz.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tgz.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_txt.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_orange_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_height.png
+	$(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-filequickprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcalendar.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove_other.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove_other.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/forward.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/info.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec_wine.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
+	$(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/bt.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-rpm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-stamp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
-	$(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
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_eightnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kword_kwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/html.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_fwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_j.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/bt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/metafont.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_broken.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_all_tabs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/blockdevice.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/about_kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_full.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/signature.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_unsubscribe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-	-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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/blockdevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/queue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edittrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/lock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gettext.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editshred.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/lock_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_h.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcalendar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileopen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/eraser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_start.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/scanner.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcut.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_generic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/start.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/apply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_crystal.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
-	-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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_center.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_critical.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filenew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_toolbar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/widget_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/project_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_pause.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sum.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_query.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/gohome.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/help.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_window.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_duplicate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileopen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/undo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/compfile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_strike.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/chardevice.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/link_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/back.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bold.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/bt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rebuild.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_java.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history_clear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/netscape_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_favorite.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_truetype.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/queue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/ascii.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/about_kde.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/key_enter.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/temporary.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/down.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_crystal.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileimport.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_moc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/mozilla_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fullnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/move.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_php.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_all_tabs.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark.png
+	$(INSTALL_DATA) $(srcdir)/cr64-action-favorites.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new_bg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_bg.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filequickprint.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-frameprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/unlock.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-device-joystick.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/goto.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_grey.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_grey.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-news_unsubscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_unsubscribe.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_rsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-5floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_yellow.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-message.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/message.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/compfile.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/eraser.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_py.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/up.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_j.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filefind.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
+	$(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-colorscm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_o.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_locked.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/queue.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-inline_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-translate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_favorite.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pk.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_moc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_blue.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/project_open.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_generic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-binary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/binary.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-device-mouse.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mouse.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_query.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_php.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_type1.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_strike.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_important.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-link_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gettext.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_rew.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_l.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_moc.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-5floppy_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kformula_kfo.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/binary.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-html.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/html.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileprint.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-button_cancel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_cancel.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-kdevelop_down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-sound.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replylist.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_page.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
+	$(INSTALL_DATA) $(srcdir)/cr128-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_type1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_choose.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-1leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_get.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-gohome.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/gohome.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-nfs_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_window.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_line.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_f.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_text.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_add.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-vcalendar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pdf.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-dvd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_crystal.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-temporary.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/temporary.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_print.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_all_tabs.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_umount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileimport.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/bt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/karbon_karbon.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-system.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-file_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-pdf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_moc.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/lock_overlay.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-wizard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_blue.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_start.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-metafont.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/metafont.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_h.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-action-add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_abs.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_center.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_left_right.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/start.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_favorite.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-about_kde.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/about_kde.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_blue.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdr.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_icon.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_html.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_fill.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/finish.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-forward.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_red.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
+	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-indent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-message_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/lock.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_all_tabs.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-usbpendrive_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_mount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_play.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
+	$(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-colorpicker.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_h.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/zip.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/empty.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmagfit.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brackets.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_no.png
+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_home.svgz
+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_fwd.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-gf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_php.png
+	$(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-kugardata.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsup.png
+	$(INSTALL_DATA) $(srcdir)/cr16-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_sqrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edittrash.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/dvi.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdimage.png
+	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
+	$(INSTALL_DATA) $(srcdir)/cr128-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/share.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/back.png
+	$(INSTALL_DATA) $(srcdir)/cr64-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
+	$(INSTALL_DATA) $(srcdir)/crsc-mime-recycled.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_remove.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exit.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_generic.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red_open.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
+	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
+	$(INSTALL_DATA) $(srcdir)/cr16-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_truetype.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
+	$(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home2.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt2.png
+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
+
+uninstall-kde-icons:
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/finish.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_page.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_pause.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kugar_kud.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_pl.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_creating.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1rightarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_broken.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/charset.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/unlock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_java.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history_clear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_toolbars.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_full.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/airbrush.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_pause.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/empty.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_suppressed.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_unsubscribe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/finish.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/widget_doc.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_temporary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_toolbar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/undo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_abs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileprint.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_all_tabs.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/widget_doc.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_rew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_32ndnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/file_broken.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/attach.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/rpm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_nofullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_bitmap.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/previous.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/apply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_php.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/decrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2downarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/binary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_pl.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edittrash.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_unsubscribe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kmultiple.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kde.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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mouse.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/wizard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_sub.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/binary.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_truetype.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_pl.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_duplicate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmagfit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_fullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_black.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/bookmark.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tar.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_rew.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_raised.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_blue.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_php.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tv.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_fill.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network_local.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcut.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/scanner.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sqrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/chardevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replylist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_height.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pk.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/rpm.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
-	-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/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_crystal.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/mozilla_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_dottednote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_eject.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replyall.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/revert.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/run.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/charset.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_pause.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pdf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tar.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/core.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/about_kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_pause.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2rightarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/link_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rebuild.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/previous.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_strike.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bold.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network_local.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/soffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/printer1.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document2.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_cw.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_pause.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_32ndnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/next.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tv.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/history.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_py.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_blue.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_end.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kmultiple.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/decrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/mozilla_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/bottom.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1uparrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/chardevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kformula_kfo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmagfit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_eightnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tex.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/queue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_critical.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/identity.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/signature.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editshred.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcopy.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/log.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_temporary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/colorscm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fermatenote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/about_kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/chardevice.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filenew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/core.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2downarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_abs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/key_enter.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1rightarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kspread_ksp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_end.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_all_tabs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcalendar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_blue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tgz.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_left.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pdf.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/link_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/karbon_karbon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/link_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kspread_ksp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/blockdevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/blend.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_top_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_important.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/midi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileopen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/charset.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_rew.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_full.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/key_enter.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_sub.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/blockdevice.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tv.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sum.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_py.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/eraser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/karbon_karbon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_truetype.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fullnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/binary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/blend.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/configure.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_multicolumn.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kword_kwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/zip_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_ccw.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_left_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec_wine.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tex.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdtrack.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/joystick.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/make.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/rpm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/file_broken.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/soffice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/wizard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pdf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/help.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_time.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_moc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_blue.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/about_kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tex.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kchart_chrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filequickprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_s.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network_local.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/identity.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_nofullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fermatenote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileprint.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replyall.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cancel.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/previous.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/spellcheck.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/move.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/joystick.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/log.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/desktop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pk.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/emptytrash.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tgz.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/up.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/empty.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kugar_kud.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_stop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/file_broken.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/configure.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
-	-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/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
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_height.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_grey.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_sqrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/bt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/previous.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_moc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/airbrush.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/midi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove_other.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/forward.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/info.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec_wine.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_bg.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filequickprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/unlock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/goto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_grey.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdtrack.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_unsubscribe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/message.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/compfile.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/eraser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_py.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/up.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_j.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filefind.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_locked.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/queue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_favorite.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_blue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/project_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/binary.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mouse.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_query.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_php.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_truetype.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_no.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tv.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_suppressed.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_y.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_black.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/printer1.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_abs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_important.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/bottom.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gettext.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_rew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kformula_kfo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/html.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_cancel.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_replylist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_page.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_choose.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_left_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/gohome.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_window.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_line.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_abs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pk.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vcard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/joystick.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/next.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcopy.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_text.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/message.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_php.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2rightarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pdf.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/karbon_karbon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_ccw.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdr.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_crystal.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/temporary.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_all_tabs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileimport.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/bt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/karbon_karbon.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_choose.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_cpp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_toolbars.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_moc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/lock_overlay.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_blue.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/metafont.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_abs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_center.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_left_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/start.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_favorite.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/about_kde.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_blue.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdr.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_icon.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileopen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_fill.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/finish.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_start.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/lock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_all_tabs.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kde.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/smart_media_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_h.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/zip.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/empty.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmagfit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_no.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_home.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_cancel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/misc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_fwd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
-	-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/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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_mount.png
-	-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
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/eraser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1uparrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmagfit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_fullscreen.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document2.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/bt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_abs.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt2.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_icon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_find.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network_local.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_dottednote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/rpm.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_blue.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileprint.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cancel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/www.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_php.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsup.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edittrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/printer1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_bg.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/down.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/dvi.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdimage.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red.svgz
-	-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/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
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove_other.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/system.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/netscape_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filefind.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsub.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/share.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_type1.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/finish.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/joystick.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_creating.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cd.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/emptytrash.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_unmount.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pdf.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_mount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/mozilla_doc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/deb.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/spellcheck.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/forward.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_eject.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/back.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_remove.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exit.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_generic.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red_open.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_truetype.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home2.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt2.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
-	-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
 
 #>+ 15
 force-reedit:
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/pics/crystalsvg/index.theme
+++ kdelibs-3.5.10.dfsg.1/pics/crystalsvg/index.theme
@@ -236,3 +236,4 @@
 Size=128
 Context=MimeTypes
 Type=Threshold
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/pics/emoticons/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/pics/emoticons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -372,12 +378,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -388,8 +394,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -410,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:
@@ -588,8 +594,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/pics/hicolor/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/pics/hicolor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -372,12 +378,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -388,8 +394,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -410,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:
@@ -588,8 +594,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/pics/hicolor/index.theme
+++ kdelibs-3.5.10.dfsg.1/pics/hicolor/index.theme
@@ -716,3 +716,4 @@
 Size=48
 Context=Stock
 Type=Threshold
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdesu/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdesu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -63,7 +63,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkdesu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libkdesu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la
 am_libkdesu_la_OBJECTS = client.lo process.lo kcookie.lo su.lo ssh.lo \
 	stub.lo kdesu_pty.lo
 #>- libkdesu_la_OBJECTS = $(am_libkdesu_la_OBJECTS)
@@ -86,7 +87,7 @@
 #>- kdesu_stub_OBJECTS = $(am_kdesu_stub_OBJECTS)
 #>+ 1
 kdesu_stub_OBJECTS = kdesu_stub.$(OBJEXT)
-kdesu_stub_DEPENDENCIES = ../kdecore/libkdefakes.la
+kdesu_stub_DEPENDENCIES =
 kdesu_stub_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(kdesu_stub_LDFLAGS) $(LDFLAGS) -o $@
@@ -141,6 +142,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -255,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@
@@ -283,6 +285,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -292,6 +295,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -320,6 +324,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -370,6 +375,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -427,6 +433,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -438,7 +445,7 @@
 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) 
-libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIBUTIL)
+libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
 libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
@@ -447,19 +454,19 @@
 kdesu_HEADERS = defaults.h client.h process.h kdesu_pty.h kcookie.h su.h ssh.h stub.h
 kdesu_stub_SOURCES = kdesu_stub.c
 kdesu_stub_LDFLAGS = $(all_libraries)
-kdesu_stub_LDADD = ../kdecore/libkdefakes.la
+kdesu_stub_LDADD = 
 #>- all: all-am
 #>+ 1
 all: docs-am  all-am
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -470,8 +477,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -492,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
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -642,7 +649,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -950,8 +957,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kconf_update/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kconf_update/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -80,7 +80,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-#>- kconf_update_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kconf_update_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1)
 #>+ 1
 kconf_update_la_DEPENDENCIES = libkdeinit_kconf_update.la
 #>- am_kconf_update_la_OBJECTS = kconf_update.lo
@@ -145,6 +146,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -259,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@
@@ -287,6 +289,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -296,6 +299,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -324,6 +328,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -374,6 +379,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -431,6 +437,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -444,7 +451,7 @@
 lib_LTLIBRARIES =   libkdeinit_kconf_update.la
 kdeinit_LTLIBRARIES = kconf_update.la
 kconf_update_la_SOURCES = kconf_update.cpp
-#>- kconf_update_la_LIBADD = $(LIB_KDECORE)
+#>- kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 #>+ 1
 kconf_update_la_LIBADD = libkdeinit_kconf_update.la
 kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -455,12 +462,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -471,8 +478,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,9 +500,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -622,7 +629,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -815,13 +822,14 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kconf_update_la_LIBADD = $(LIB_KDECORE)
+libkdeinit_kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 
 #>+ 2
 libkdeinit_kconf_update_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kconf_update_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 3
+libkdeinit_kconf_update_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_kconf_update_la_OBJECTS = kconf_update.lo
@@ -851,8 +859,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kinit/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kinit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -85,7 +85,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-#>- klauncher_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- klauncher_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 #>+ 1
 klauncher_la_DEPENDENCIES = libkdeinit_klauncher.la
 #>- am_klauncher_la_OBJECTS = klauncher.lo klauncher_main.lo autostart.lo
@@ -283,6 +285,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -397,7 +401,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@
@@ -425,6 +428,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -434,6 +438,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -462,6 +467,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -512,6 +518,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -569,6 +576,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -608,7 +616,7 @@
 kwrapper_SOURCES = kwrapper.c
 kwrapper_LDADD = $(LIBSOCKET)
 klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#>- klauncher_la_LIBADD = $(LIB_KIO)
+#>- klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 #>+ 1
 klauncher_la_LIBADD = libkdeinit_klauncher.la
 klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
@@ -632,12 +640,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -648,8 +656,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -670,9 +678,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -950,7 +958,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1281,13 +1289,15 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_klauncher_la_LIBADD = $(LIB_KIO)
+libkdeinit_klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 #>+ 2
 libkdeinit_klauncher_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_klauncher_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 4
+libkdeinit_klauncher_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_klauncher_la_OBJECTS = klauncher.lo klauncher_main.lo autostart.lo
@@ -1328,8 +1338,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kinit/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kinit/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -96,6 +96,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -210,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@
@@ -238,6 +239,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -247,6 +249,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -275,6 +278,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -325,6 +329,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -382,6 +387,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -398,12 +404,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -414,8 +420,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -436,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
 
 clean-checkPROGRAMS:
@@ -491,7 +497,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -683,8 +689,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kded_post/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kded_post/Makefile.in
@@ -0,0 +1,786 @@
+# Makefile.in generated by automake 1.10.2 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, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = kded_post
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/dcop/dcop-path.h \
+	$(top_builddir)/kdecore/kdemacros.h \
+	$(top_builddir)/kio/kssl/ksslconfig.h \
+	$(top_builddir)/kjs/global.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+#>- 	html-recursive info-recursive install-data-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
+#>+ 7
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-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)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AR = @AR@
+ARTSCCONFIG = @ARTSCCONFIG@
+AUTOCONF = @AUTOCONF@
+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@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DCOPIDL = @DCOPIDL@
+DCOPIDL2CPP = @DCOPIDL2CPP@
+DCOPIDLNG = @DCOPIDLNG@
+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
+EXEEXT = @EXEEXT@
+EXR_FLAGS = @EXR_FLAGS@
+EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GSSAPI_INCS = @GSSAPI_INCS@
+GSSAPI_LIBS = @GSSAPI_LIBS@
+GSSAPI_RPATH = @GSSAPI_RPATH@
+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_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
+KCONFIG_COMPILER = @KCONFIG_COMPILER@
+KDEINIT_SETUID = @KDEINIT_SETUID@
+KDEINIT_XFT_INCLUDES = @KDEINIT_XFT_INCLUDES@
+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
+KDE_FORCE_INLINE = @KDE_FORCE_INLINE@
+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
+KDE_HAVE_DOT = @KDE_HAVE_DOT@
+KDE_INCLUDES = @KDE_INCLUDES@
+KDE_LDFLAGS = @KDE_LDFLAGS@
+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
+KDE_MT_LIBS = @KDE_MT_LIBS@
+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
+KDE_PLUGIN = @KDE_PLUGIN@
+KDE_RPATH = @KDE_RPATH@
+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
+KDE_USE_FPIE = @KDE_USE_FPIE@
+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
+KDE_USE_PIE = @KDE_USE_PIE@
+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
+KJAVA_POLICYPATH = @KJAVA_POLICYPATH@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBART_CFLAGS = @LIBART_CFLAGS@
+LIBART_LIBS = @LIBART_LIBS@
+LIBART_RPATH = @LIBART_RPATH@
+LIBASOUND = @LIBASOUND@
+LIBBZ2 = @LIBBZ2@
+LIBCOMPAT = @LIBCOMPAT@
+LIBCRYPT = @LIBCRYPT@
+LIBDL = @LIBDL@
+LIBFAM = @LIBFAM@
+LIBICE = @LIBICE@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBPCRE = @LIBPCRE@
+LIBPNG = @LIBPNG@
+LIBPTHREAD = @LIBPTHREAD@
+LIBRESOLV = @LIBRESOLV@
+LIBS = @LIBS@
+LIBSM = @LIBSM@
+LIBSOCKET = @LIBSOCKET@
+LIBSSL = @LIBSSL@
+LIBTHAI = @LIBTHAI@
+LIBTIFF = @LIBTIFF@
+LIBTOOL = @LIBTOOL@
+LIBUCB = @LIBUCB@
+LIBUTEMPTER = @LIBUTEMPTER@
+LIBUTIL = @LIBUTIL@
+LIBVOLMGT = @LIBVOLMGT@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXML_RPATH = @LIBXML_RPATH@
+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
+LIBXSLT_LIBS = @LIBXSLT_LIBS@
+LIBXSLT_RPATH = @LIBXSLT_RPATH@
+LIBZ = @LIBZ@
+LIB_CUPS = @LIB_CUPS@
+LIB_EXR = @LIB_EXR@
+LIB_IDN = @LIB_IDN@
+LIB_JASPER = @LIB_JASPER@
+LIB_KAB = @LIB_KAB@
+LIB_KABC = @LIB_KABC@
+LIB_KDECORE = @LIB_KDECORE@
+LIB_KDED = @LIB_KDED@
+LIB_KDEPIM = @LIB_KDEPIM@
+LIB_KDEPRINT = @LIB_KDEPRINT@
+LIB_KDEUI = @LIB_KDEUI@
+LIB_KDNSSD = @LIB_KDNSSD@
+LIB_KFILE = @LIB_KFILE@
+LIB_KFM = @LIB_KFM@
+LIB_KHTML = @LIB_KHTML@
+LIB_KIMGIO = @LIB_KIMGIO@
+LIB_KIMPROXY = @LIB_KIMPROXY@
+LIB_KIO = @LIB_KIO@
+LIB_KJS = @LIB_KJS@
+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
+LIB_KPARTS = @LIB_KPARTS@
+LIB_KSPELL = @LIB_KSPELL@
+LIB_KSYCOCA = @LIB_KSYCOCA@
+LIB_KUNITTEST = @LIB_KUNITTEST@
+LIB_KUTILS = @LIB_KUTILS@
+LIB_POLL = @LIB_POLL@
+LIB_QPE = @LIB_QPE@
+LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
+LIB_SMB = @LIB_SMB@
+LIB_X11 = @LIB_X11@
+LIB_XEXT = @LIB_XEXT@
+LIB_XRENDER = @LIB_XRENDER@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+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@
+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRECFLAGS = @PCRECFLAGS@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+QNAMESPACE_H = @QNAMESPACE_H@
+QTDOCDIR = @QTDOCDIR@
+QTE_NORTTI = @QTE_NORTTI@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LDFLAGS = @QT_LDFLAGS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSL_INCLUDES = @SSL_INCLUDES@
+SSL_LDFLAGS = @SSL_LDFLAGS@
+STRIP = @STRIP@
+TOPSUBDIRS = @TOPSUBDIRS@
+UIC = @UIC@
+UIC_TR = @UIC_TR@
+USER_INCLUDES = @USER_INCLUDES@
+USER_LDFLAGS = @USER_LDFLAGS@
+USE_EXCEPTIONS = @USE_EXCEPTIONS@
+USE_RTTI = @USE_RTTI@
+USE_THREADS = @USE_THREADS@
+VERSION = @VERSION@
+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_INCLUDES = @X_INCLUDES@
+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__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+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@
+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@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+kde_appsdir = @kde_appsdir@
+kde_bindir = @kde_bindir@
+kde_confdir = @kde_confdir@
+kde_cups_config = @kde_cups_config@
+kde_datadir = @kde_datadir@
+kde_htmldir = @kde_htmldir@
+kde_icondir = @kde_icondir@
+kde_includes = @kde_includes@
+kde_kcfgdir = @kde_kcfgdir@
+kde_libraries = @kde_libraries@
+kde_libs_htmldir = @kde_libs_htmldir@
+kde_libs_prefix = @kde_libs_prefix@
+kde_locale = @kde_locale@
+kde_mimedir = @kde_mimedir@
+kde_moduledir = @kde_moduledir@
+kde_qtver = @kde_qtver@
+kde_servicesdir = @kde_servicesdir@
+kde_servicetypesdir = @kde_servicetypesdir@
+kde_sounddir = @kde_sounddir@
+kde_styledir = @kde_styledir@
+kde_templatesdir = @kde_templatesdir@
+kde_wallpaperdir = @kde_wallpaperdir@
+kde_widgetdir = @kde_widgetdir@
+kdeinitdir = @kdeinitdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+path_su = @path_su@
+path_sudo = @path_sudo@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+qt_includes = @qt_includes@
+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@
+top_build_prefix = @top_build_prefix@
+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@
+SUBDIRS = ../kdeui/kdetrayproxy ../kio/kpasswdserver ../kio/misc
+#>- all: all-recursive
+#>+ 1
+all: docs-am  all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+#>- 	@for dep in $?; do \
+#>- 	  case '$(am__configure_deps)' in \
+#>- 	    *$$dep*) \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
+#>- 	      exit 1;; \
+#>- 	  esac; \
+#>- 	done; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kded_post/Makefile'; \
+#>- 	cd $(top_srcdir) && \
+#>- 	  $(AUTOMAKE) --foreign  kded_post/Makefile
+#>+ 12
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kded_post/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  kded_post/Makefile
+	cd $(top_srcdir) && perl admin/am_edit kded_post/Makefile.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-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)'; \
+	  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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+#>- clean: clean-recursive
+#>+ 1
+clean: kde-rpo-clean  clean-recursive
+
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.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-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-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
+
+# 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:
+
+#>+ 2
+KDE_DIST=Makefile.in Makefile.am 
+
+#>+ 2
+docs-am:
+
+#>+ 15
+force-reedit:
+		@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kded_post/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  kded_post/Makefile
+	cd $(top_srcdir) && perl admin/am_edit kded_post/Makefile.in
+
+
+#>+ 21
+clean-bcheck: 
+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+
+bcheck: bcheck-recursive
+
+bcheck-am:
+	@for i in ; do \
+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+	        echo "$$i"; \
+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+	            rm -f $$i.bchecktest.cc; exit 1; \
+	        fi ; \
+	        echo "" >> $$i.bchecktest.cc.class; \
+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+	        rm -f a.out; \
+	    fi ; \
+	done
+
+
+#>+ 3
+final:
+	$(MAKE) all-am
+
+#>+ 3
+final-install:
+	$(MAKE) install-am
+
+#>+ 3
+no-final:
+	$(MAKE) all-am
+
+#>+ 3
+no-final-install:
+	$(MAKE) install-am
+
+#>+ 3
+kde-rpo-clean:
+	-rm -f *.rpo
+
+#>+ 3
+nmcheck: 
+nmcheck-am: nmcheck
--- kdelibs-3.5.10.dfsg.1.orig/doc/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/doc/kdelibs/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/doc/kdelibs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -364,12 +370,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -380,8 +386,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -402,9 +408,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:
@@ -559,8 +565,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/doc/common/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/doc/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -76,6 +76,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -190,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@
@@ -218,6 +219,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -227,6 +229,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -255,6 +258,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -305,6 +309,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -362,6 +367,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -390,12 +396,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -406,8 +412,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -428,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:
@@ -596,7 +602,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=4.png doctop1b.png doctop1a-online.png bottom2.png doctop2-online.png appheader.html doctop1.png 2.png kde-default.css web-doctop.png 10.png x11-license.html 1.png kde_logo.png mainfooter.html bottom-left.png top-middle.png lgpl-license.html mainheader.html kde_gear_64.png bottom1.png grad.png qpl-license.html doxygen.css lgpl-license 6.png README.Doxygen gpl-license.html kde-web.css top-left.png headerbg.png Makefile.in footer.html kde-common.css bottom-right.png web-docbottom.png docheadergears.png shadow.png fdl-license.html kde_logo_bg.png 8.png doctop2.png top-right-konqueror.png 9.png kde-localised.css.template doctop1a.png kmenu.png artistic-license.html xml.dcl bsd-license.html fdl-notice.html 3.png 5.png header.html bottom-middle.png favicon.ico Makefile.am fdl-license 7.png gpl-license 
+KDE_DIST=4.png doctop1b.png doctop1a-online.png doctop2-online.png bottom2.png appheader.html doctop1.png 2.png kde-default.css web-doctop.png 10.png x11-license.html 1.png kde_logo.png mainfooter.html bottom-left.png top-middle.png kde_gear_64.png mainheader.html lgpl-license.html bottom1.png grad.png qpl-license.html doxygen.css 6.png lgpl-license README.Doxygen gpl-license.html kde-web.css top-left.png Makefile.in headerbg.png footer.html kde-common.css web-docbottom.png docheadergears.png bottom-right.png fdl-license.html kde_logo_bg.png shadow.png 8.png doctop2.png top-right-konqueror.png kde-localised.css.template 9.png doctop1a.png kmenu.png xml.dcl bsd-license.html fdl-notice.html artistic-license.html 3.png 5.png bottom-middle.png header.html favicon.ico Makefile.am fdl-license 7.png gpl-license 
 
 #>+ 2
 docs-am:
@@ -606,8 +612,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/doc/kspell/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/doc/kspell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -363,12 +369,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -379,8 +385,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -401,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:
@@ -606,8 +612,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kded/kdedmodule.desktop
+++ kdelibs-3.5.10.dfsg.1/kded/kdedmodule.desktop
@@ -88,3 +88,4 @@
 Type=bool
 [PropertyDef::X-KDE-Kded-load-on-demand]
 Type=bool
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kded/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kded/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -87,7 +87,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-#>- kbuildsycoca_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kbuildsycoca_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+#>- 	$(am__DEPENDENCIES_1)
 #>+ 1
 kbuildsycoca_la_DEPENDENCIES = libkdeinit_kbuildsycoca.la
 #>- am_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo \
@@ -106,7 +108,9 @@
 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)
+#>- kded_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+#>- 	$(am__DEPENDENCIES_1)
 #>+ 1
 kded_la_DEPENDENCIES = libkdeinit_kded.la
 #>- am_kded_la_OBJECTS = kded.lo kdedmodule.lo
@@ -205,6 +209,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -319,7 +325,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@
@@ -347,6 +352,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -356,6 +362,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -384,6 +391,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -434,6 +442,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -491,6 +500,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -504,12 +514,12 @@
 lib_LTLIBRARIES =   libkdeinit_kded.la libkdeinit_kbuildsycoca.la
 kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
 kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#>- kded_la_LIBADD = $(LIB_KIO)
+#>- kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 #>+ 1
 kded_la_LIBADD = libkdeinit_kded.la
 kded_la_SOURCES = kded.cpp kdedmodule.cpp
 kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#>- kbuildsycoca_la_LIBADD = $(LIB_KIO)
+#>- kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 #>+ 1
 kbuildsycoca_la_LIBADD = libkdeinit_kbuildsycoca.la
 kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
@@ -524,7 +534,7 @@
 kdontchangethehostname_LDADD = $(LIB_KDECORE) 
 kdontchangethehostname_SOURCES = khostname.cpp
 kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kde_menu_LDADD = $(LIB_KIO) 
+kde_menu_LDADD = $(LIB_KIO)
 kde_menu_SOURCES = kde-menu.cpp
 #>- METASOURCES = AUTO
 include_HEADERS = kdedmodule.h
@@ -544,12 +554,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -560,8 +570,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -582,9 +592,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -798,7 +808,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1088,25 +1098,29 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kded_la_LIBADD = $(LIB_KIO)
+libkdeinit_kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 #>+ 2
 libkdeinit_kded_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kded_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 4
+libkdeinit_kded_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_kded_la_OBJECTS = kded.lo kdedmodule.lo
 
 #>+ 2
-libkdeinit_kbuildsycoca_la_LIBADD = $(LIB_KIO)
+libkdeinit_kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 
 #>+ 2
 libkdeinit_kbuildsycoca_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kbuildsycoca_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 4
+libkdeinit_kbuildsycoca_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1)
 
 #>+ 5
 am_libkdeinit_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo \
@@ -1183,8 +1197,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kded/test/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kded/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -119,6 +119,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -233,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@
@@ -261,6 +262,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +272,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +301,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +352,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +410,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -430,12 +436,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -446,8 +452,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -468,9 +474,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -559,7 +565,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -780,8 +786,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kded/test/test.desktop
+++ kdelibs-3.5.10.dfsg.1/kded/test/test.desktop
@@ -171,3 +171,4 @@
 Comment[zh_HK]=KDED 的測試模組
 Comment[zh_TW]=KDED 的測試模組
 Comment[zu]=Ingxenye Yokuvivinya ye-KDED
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/gif.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/gif.kimgio
@@ -83,3 +83,5 @@
 Suffices=gif,GIF
 Mimetype=image/gif
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/dds.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/dds.kimgio
@@ -62,3 +62,5 @@
 Mimetype=image/x-dds
 Library=kimg_dds.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/pcx.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/pcx.kimgio
@@ -83,3 +83,5 @@
 Suffices=pcx,PCX
 Mimetype=image/x-pcx
 Library=kimg_pcx.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/psd.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/psd.kimgio
@@ -70,3 +70,5 @@
 Mimetype=image/x-vnd.adobe.photoshop
 Library=kimg_psd.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/png.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/png.kimgio
@@ -83,3 +83,5 @@
 Suffices=png,PNG
 Mimetype=image/png
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/ppm.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/ppm.kimgio
@@ -83,3 +83,5 @@
 Suffices=ppm,PPM,pnm,PNM,ppmraw,PPMRAW
 Mimetype=image/x-portable-pixmap
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/bmp.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/bmp.kimgio
@@ -83,3 +83,5 @@
 Suffices=bmp,BMP
 Mimetype=image/x-bmp
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/xcf.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/xcf.kimgio
@@ -76,3 +76,5 @@
 Suffices=xcf,XCF
 Mimetype=image/x-xcf-gimp
 Library=kimg_xcf.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/xv.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/xv.kimgio
@@ -85,3 +85,5 @@
 Mimetype=
 Library=kimg_xview.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/xpm.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/xpm.kimgio
@@ -83,3 +83,5 @@
 Suffices=xpm,XPM
 Mimetype=image/x-xpm
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/eps.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/eps.kimgio
@@ -84,3 +84,5 @@
 Mimetype=image/x-eps
 Library=kimg_eps.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kimgio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -63,7 +63,7 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kimg_dds_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+kimg_dds_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_dds_la_OBJECTS = dds.lo
 #>- kimg_dds_la_OBJECTS = $(am_kimg_dds_la_OBJECTS)
 #>+ 1
@@ -75,7 +75,7 @@
 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)
+kimg_eps_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kimg_eps_la_OBJECTS = eps.lo
 #>- kimg_eps_la_OBJECTS = $(am_kimg_eps_la_OBJECTS)
 #>+ 1
@@ -87,8 +87,7 @@
 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)
+kimg_exr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kimg_exr_la_OBJECTS = exr.lo
 #>- kimg_exr_la_OBJECTS = $(am_kimg_exr_la_OBJECTS)
 #>+ 1
@@ -102,7 +101,7 @@
 	$(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)
+kimg_hdr_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_hdr_la_OBJECTS = hdr.lo
 #>- kimg_hdr_la_OBJECTS = $(am_kimg_hdr_la_OBJECTS)
 #>+ 1
@@ -141,7 +140,7 @@
 	$(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)
+kimg_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_pcx_la_OBJECTS = pcx.lo
 #>- kimg_pcx_la_OBJECTS = $(am_kimg_pcx_la_OBJECTS)
 #>+ 1
@@ -153,7 +152,7 @@
 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)
+kimg_psd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_psd_la_OBJECTS = psd.lo
 #>- kimg_psd_la_OBJECTS = $(am_kimg_psd_la_OBJECTS)
 #>+ 1
@@ -165,7 +164,7 @@
 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)
+kimg_rgb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_rgb_la_OBJECTS = rgb.lo
 #>- kimg_rgb_la_OBJECTS = $(am_kimg_rgb_la_OBJECTS)
 #>+ 1
@@ -177,7 +176,7 @@
 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)
+kimg_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_tga_la_OBJECTS = tga.lo
 #>- kimg_tga_la_OBJECTS = $(am_kimg_tga_la_OBJECTS)
 #>+ 1
@@ -204,7 +203,7 @@
 	$(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)
+kimg_xcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_xcf_la_OBJECTS = xcf.lo
 #>- kimg_xcf_la_OBJECTS = $(am_kimg_xcf_la_OBJECTS)
 #>+ 1
@@ -283,6 +282,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -397,7 +398,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@
@@ -425,6 +425,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -434,6 +435,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -462,6 +464,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -512,6 +515,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -569,6 +573,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -601,7 +606,7 @@
 kimg_xview_la_LIBADD = $(LIB_QT)
 kimg_eps_la_SOURCES = eps.cpp
 kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_eps_la_LIBADD = $(LIB_KDECORE)
+kimg_eps_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 kimg_ico_la_SOURCES = ico.cpp
 kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_ico_la_LIBADD = $(LIB_QT)
@@ -610,28 +615,28 @@
 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)
-kimg_pcx_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_pcx_la_LIBADD = $(LIB_QT)
 kimg_tga_la_SOURCES = tga.cpp
 kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_tga_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_tga_la_LIBADD = $(LIB_QT)
 kimg_rgb_la_SOURCES = rgb.cpp
 kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_rgb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_rgb_la_LIBADD = $(LIB_QT)
 kimg_xcf_la_SOURCES = xcf.cpp
 kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_xcf_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_xcf_la_LIBADD = $(LIB_QT)
 kimg_exr_la_SOURCES = exr.cpp
 kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_EXR)
+kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_EXR)
 kimg_dds_la_SOURCES = dds.cpp
 kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_dds_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_dds_la_LIBADD = $(LIB_QT)
 kimg_psd_la_SOURCES = psd.cpp
 kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_psd_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_psd_la_LIBADD = $(LIB_QT)
 kimg_hdr_la_SOURCES = hdr.cpp
 kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_hdr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+kimg_hdr_la_LIBADD = $(LIB_QT)
 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)
 servicedir = $(kde_servicesdir)
@@ -647,12 +652,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -663,8 +668,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -685,9 +690,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -812,7 +817,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1107,8 +1112,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/pbm.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/pbm.kimgio
@@ -82,3 +82,5 @@
 Suffices=pbm,PBM,pbmraw,PBMRAW
 Mimetype=image/x-portable-bitmap
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/tiff.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/tiff.kimgio
@@ -83,3 +83,5 @@
 Suffices=tiff,TIFF,tif,TIF
 Mimetype=image/tiff
 Library=kimg_tiff.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/hdr.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/hdr.kimgio
@@ -60,3 +60,5 @@
 Mimetype=image/x-hdr
 Library=kimg_hdr.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/exr.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/exr.kimgio
@@ -64,3 +64,5 @@
 Suffices=.exr,.EXR
 Mimetype=image/x-exr
 Library=kimg_exr.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/xbm.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/xbm.kimgio
@@ -83,3 +83,5 @@
 Suffices=xbm,XBM
 Mimetype=image/x-xbm
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/tga.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/tga.kimgio
@@ -84,3 +84,5 @@
 Mimetype=image/x-targa
 Library=kimg_tga.la
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/rgb.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/rgb.kimgio
@@ -78,3 +78,5 @@
 Suffices=rgb,RGB,rgba,RGBA,bw,BW,sgi,SGI
 Mimetype=image/x-rgb
 Library=kimg_rgb.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/pgm.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/pgm.kimgio
@@ -82,3 +82,5 @@
 Suffices=pgm,PGM,pgmraw,PGMRAW
 Mimetype=image/x-portable-greymap
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/mng.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/mng.kimgio
@@ -77,3 +77,5 @@
 Suffices=mng,MNG
 Mimetype=video/x-mng
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/ico.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/ico.kimgio
@@ -82,3 +82,5 @@
 Suffices=ico,ICO
 Mimetype=image/x-ico
 Library=kimg_ico.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/jpeg.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/jpeg.kimgio
@@ -83,3 +83,5 @@
 Suffices=jpg,JPG,jpeg,JPEG
 Mimetype=image/jpeg
 Library=
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/jp2.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/jp2.kimgio
@@ -83,3 +83,5 @@
 Suffices=jp2,JP2
 Mimetype=image/jp2
 Library=kimg_jp2.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kimgio/g3.kimgio
+++ kdelibs-3.5.10.dfsg.1/kimgio/g3.kimgio
@@ -75,3 +75,5 @@
 Suffices=g3,G3,
 Mimetype=image/fax-g3
 Library=kimg_g3.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -77,7 +77,9 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kded_kdeprintd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kded/libkdeinit_kded.la
 am_kded_kdeprintd_la_OBJECTS = kdeprintd.lo kprintprocess.lo
 #>- kded_kdeprintd_la_OBJECTS = $(am_kded_kdeprintd_la_OBJECTS)
 #>+ 1
@@ -208,6 +210,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -322,7 +326,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@
@@ -350,6 +353,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -359,6 +363,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -387,6 +392,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -437,6 +443,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -494,6 +501,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -509,7 +517,7 @@
 #>- kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp
 #>+ 1
 kded_kdeprintd_la_SOURCES= kdeprintd.cpp kprintprocess.cpp kdeprintd_skel.cpp
-kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
+kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libkdeinit_kded.la
 kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #kded_kdeprintd_la_METASOURCES = AUTO
 lib_LTLIBRARIES = libkdeprint.la
@@ -538,7 +546,7 @@
 			 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
-libkdeprint_la_LIBADD = $(LIB_KPARTS) $(LIBZ)
+libkdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
 libkdeprint_la_DEPENDENCIES = $(LIB_KPARTS) 
 #>- libkdeprint_la_METASOURCES = AUTO
 noinst_HEADERS = kmdbentry.h kmfactory.h \
@@ -588,12 +596,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -604,8 +612,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -626,9 +634,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
@@ -997,7 +1005,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1373,18 +1381,18 @@
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmfactory.kidl
 
 #>+ 3
-posterpreview.moc: $(srcdir)/posterpreview.h
-	$(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
+kprintdialog.moc: $(srcdir)/kprintdialog.h
+	$(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
 
 #>+ 2
-mocs: posterpreview.moc
+mocs: kprintdialog.moc
 
 #>+ 3
-kprintdialog.moc: $(srcdir)/kprintdialog.h
-	$(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
+posterpreview.moc: $(srcdir)/posterpreview.h
+	$(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
 
 #>+ 2
-mocs: kprintdialog.moc
+mocs: posterpreview.moc
 
 #>+ 3
 marginpreview.moc: $(srcdir)/marginpreview.h
@@ -1429,6 +1437,13 @@
 mocs: plugincombobox.moc
 
 #>+ 3
+kdeprintd.moc: $(srcdir)/kdeprintd.h
+	$(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
+
+#>+ 2
+mocs: kdeprintd.moc
+
+#>+ 3
 driverview.moc: $(srcdir)/driverview.h
 	$(MOC) $(srcdir)/driverview.h -o driverview.moc
 
@@ -1443,13 +1458,6 @@
 mocs: kpgeneralpage.moc
 
 #>+ 3
-kdeprintd.moc: $(srcdir)/kdeprintd.h
-	$(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
-
-#>+ 2
-mocs: kdeprintd.moc
-
-#>+ 3
 kpfilterpage.moc: $(srcdir)/kpfilterpage.h
 	$(MOC) $(srcdir)/kpfilterpage.h -o kpfilterpage.moc
 
@@ -1513,18 +1521,18 @@
 mocs: kprintdialogpage.moc
 
 #>+ 3
-kprintpreview.moc: $(srcdir)/kprintpreview.h
-	$(MOC) $(srcdir)/kprintpreview.h -o kprintpreview.moc
+kpqtpage.moc: $(srcdir)/kpqtpage.h
+	$(MOC) $(srcdir)/kpqtpage.h -o kpqtpage.moc
 
 #>+ 2
-mocs: kprintpreview.moc
+mocs: kpqtpage.moc
 
 #>+ 3
-kpqtpage.moc: $(srcdir)/kpqtpage.h
-	$(MOC) $(srcdir)/kpqtpage.h -o kpqtpage.moc
+kprintpreview.moc: $(srcdir)/kprintpreview.h
+	$(MOC) $(srcdir)/kprintpreview.h -o kprintpreview.moc
 
 #>+ 2
-mocs: kpqtpage.moc
+mocs: kprintpreview.moc
 
 #>+ 3
 kmuimanager.moc: $(srcdir)/kmuimanager.h
@@ -1556,7 +1564,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc driverview.moc kpgeneralpage.moc kdeprintd.moc kpfilterpage.moc kprinterpropertydialog.moc kmfactory.moc kprintprocess.moc kfilelist.moc droptionview.moc marginwidget.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
+	-rm -f  kprintdialog.moc posterpreview.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kdeprintd.moc driverview.moc kpgeneralpage.moc kpfilterpage.moc kprinterpropertydialog.moc kmfactory.moc kprintprocess.moc kfilelist.moc droptionview.moc marginwidget.moc kprinterimpl.moc kprintdialogpage.moc kpqtpage.moc kprintpreview.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
 
 #>+ 2
 KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop TODO.cups12 fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am 
@@ -1575,8 +1583,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/kdeprintd.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/kdeprintd.desktop
@@ -160,3 +160,4 @@
 Comment[zh_CN]=KDE 的打印守护进程
 Comment[zh_HK]=KDE 的列印伺服程式
 Comment[zh_TW]=KDE 的列印服務程式
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/specials.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/specials.desktop
@@ -1194,3 +1194,4 @@
 Name[zh_TW]=高階傳真工具 (ksendfax)
 Name[zu]=Ithuluz Lezinga eliphezulu lokuthumela i-fax (ksendfax)
 Require=exec:/ksendfax
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/rlpr/rlpr.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/rlpr/rlpr.print
@@ -82,3 +82,4 @@
 Comment[zu]=Ezendalo ze-RLPR (abalekeleli abakude  be-LPD)
 DetectUris=exec:/rlpr
 DetectPrecedence=0
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/rlpr/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/rlpr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,8 +60,11 @@
 am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 kdeprint_rlpr_la_DEPENDENCIES =  \
-	$(top_builddir)/kdeprint/management/libkdeprint_management.la
+	$(top_builddir)/kdeprint/management/libkdeprint_management.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_rlpr_la_OBJECTS = kmrlprfactory.lo kmrlprmanager.lo \
 	krlprprinterimpl.lo kmrlpruimanager.lo kmwrlpr.lo \
 	kmproprlpr.lo kmproxywidget.lo kmconfigproxy.lo
@@ -123,6 +126,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -237,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@
@@ -265,6 +269,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -274,6 +279,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -302,6 +308,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -352,6 +359,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -409,6 +417,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -423,7 +432,7 @@
 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
 
 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_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
 #>- kdeprint_rlpr_la_METASOURCES = AUTO
 noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
 		 kmproxywidget.h kmconfigproxy.h
@@ -436,12 +445,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -452,8 +461,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -474,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -572,7 +581,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -782,8 +791,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/foomatic/foomatic.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/foomatic/foomatic.print
@@ -15,3 +15,4 @@
 Comment[te]=ఫూమెటిక్ (సియుపిఎస్, ఎల్ పి ఆర్ అన్ జి,పిడిక్యు) 
 DetectUris=exec:/foomatic-configure,config:/foomatic/
 DetectPrecedence=0
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/foomatic/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/foomatic/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -144,6 +144,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -258,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@
@@ -286,6 +287,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -295,6 +297,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -323,6 +326,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -373,6 +377,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -430,6 +435,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -458,12 +464,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -474,8 +480,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,9 +502,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -642,7 +648,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -843,8 +849,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/pics/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/pics/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -392,12 +398,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -408,8 +414,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -430,9 +436,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:
@@ -602,7 +608,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=cr16-app-kdeprint_printer_class_stopped.png cr22-action-kdeprint_uploadsmb.png cr16-app-kdeprint_printer_class_process.png cr22-action-kdeprint_addpseudo.png cr22-action-kdeprint_defaultsoft.png cr16-app-kdeprint_job.png kdeprint_collate.png Makefile.in cr32-app-kdeprint_printer.png cr16-app-kdeprint_printer_class.png cr16-app-kdeprint_job_completed.png kdeprint_grayscale.png cr22-action-kdeprint_printer_infos.png kdeprint_opt_duplex.png cr22-action-package_utilities.png cr32-app-kdeprint_printer_class_stopped.png cr16-app-kdeprint_printer_stopped.png stopsign.png kdeprint_duplex_long.png cr22-action-kdeprint_printer.png cr32-app-kdeprint_printer_defect.png cr22-action-history.png cr32-app-kdeprint_printer_users.png cr16-app-kdeprint_printer_defect.png cr16-app-kdeprint_computer.png cr32-action-kdeprint_inklevel.png kdeprint_prettyprint.png kdeprint_uncollate_reverse.png kdeprint_nup1.png cr32-app-kdeprint_printer_process.png kdeprint_color.png cr22-action-kdeprint_restartsrv.png cr16-app-kdeprint_job_cancelled.png kdeprint_portrait.png cr16-action-filterstop.png kdeprint_revlandscape.png kdeprint_landscape.png cr64-app-kdeprint_printer.png cr48-app-kdeprint_printer.png kdeprint_nupother.png cr22-action-kdeprint_printstate.png cr16-app-kdeprint_printer_remote_stopped.png cr16-app-kdeprint_job_error.png kdeprint_nup4.png cr22-action-kdeprint_report.png cr16-app-kdeprint_job_stopped.png cr22-action-kdeprint_configmgr.png processsign.png cr16-action-kdeprint_uploadsmb.png cr32-app-kdeprint_printer_remote_stopped.png cr32-app-kdeprint_printer_remote_process.png kdeprint_nup2.png cr22-action-kdeprint_testprinter.png cr16-app-kdeprint_printer_process.png cr16-app-kdeprint_printer_remote.png kdeprint_uncollate.png kdeprint_dupl_none.png cr32-app-kdeprint_printer_class.png cr16-app-kdeprint_job_process.png cr32-app-kdeprint_printer_remote.png kdeprint_pagesize.png cr22-action-kdeprint_stopprinter.png cr16-app-kdeprint_printer_remote_process.png cr48-app-kdeprint_printer_class.png kdeprint_duplex_short.png cr22-action-kdeprint_defaulthard.png cr32-app-kdeprint_printer_class_process.png cr16-action-kdeprint_restartsrv.png cr22-app-kdeprint_printer.png cr22-action-kdeprint_enableprinter.png kdeprint_revportrait.png kdeprint_collate_reverse.png kdeprint_duplex_none.png cr32-app-kdeprint_printer_stopped.png cr22-action-kdeprint_queuestate.png cr16-app-kdeprint_printer.png cr22-action-kdeprint_addprinter.png cr64-app-kdeprint_printer_class.png Makefile.am cr22-action-kdeprint_configsrv.png 
+KDE_DIST=cr16-app-kdeprint_printer_class_stopped.png cr22-action-kdeprint_uploadsmb.png cr16-app-kdeprint_printer_class_process.png cr22-action-kdeprint_addpseudo.png cr22-action-kdeprint_defaultsoft.png cr16-app-kdeprint_job.png kdeprint_collate.png Makefile.in cr32-app-kdeprint_printer.png cr16-app-kdeprint_printer_class.png kdeprint_grayscale.png cr16-app-kdeprint_job_completed.png cr22-action-kdeprint_printer_infos.png kdeprint_opt_duplex.png cr22-action-package_utilities.png cr32-app-kdeprint_printer_class_stopped.png cr16-app-kdeprint_printer_stopped.png kdeprint_duplex_long.png stopsign.png cr22-action-kdeprint_printer.png cr32-app-kdeprint_printer_defect.png cr22-action-history.png cr32-app-kdeprint_printer_users.png cr16-app-kdeprint_computer.png cr16-app-kdeprint_printer_defect.png cr32-action-kdeprint_inklevel.png kdeprint_prettyprint.png kdeprint_uncollate_reverse.png kdeprint_nup1.png cr32-app-kdeprint_printer_process.png kdeprint_color.png cr22-action-kdeprint_restartsrv.png cr16-app-kdeprint_job_cancelled.png kdeprint_portrait.png cr16-action-filterstop.png kdeprint_landscape.png kdeprint_revlandscape.png cr64-app-kdeprint_printer.png cr48-app-kdeprint_printer.png kdeprint_nupother.png cr22-action-kdeprint_printstate.png cr16-app-kdeprint_printer_remote_stopped.png cr16-app-kdeprint_job_error.png kdeprint_nup4.png cr22-action-kdeprint_report.png cr16-app-kdeprint_job_stopped.png cr22-action-kdeprint_configmgr.png processsign.png cr32-app-kdeprint_printer_remote_stopped.png cr16-action-kdeprint_uploadsmb.png cr32-app-kdeprint_printer_remote_process.png kdeprint_nup2.png cr22-action-kdeprint_testprinter.png cr16-app-kdeprint_printer_process.png kdeprint_uncollate.png cr16-app-kdeprint_printer_remote.png kdeprint_dupl_none.png cr32-app-kdeprint_printer_class.png cr16-app-kdeprint_job_process.png cr32-app-kdeprint_printer_remote.png kdeprint_pagesize.png cr22-action-kdeprint_stopprinter.png cr16-app-kdeprint_printer_remote_process.png cr48-app-kdeprint_printer_class.png kdeprint_duplex_short.png cr22-action-kdeprint_defaulthard.png cr32-app-kdeprint_printer_class_process.png cr16-action-kdeprint_restartsrv.png cr22-app-kdeprint_printer.png cr22-action-kdeprint_enableprinter.png kdeprint_revportrait.png kdeprint_collate_reverse.png kdeprint_duplex_none.png cr32-app-kdeprint_printer_stopped.png cr22-action-kdeprint_queuestate.png cr16-app-kdeprint_printer.png cr64-app-kdeprint_printer_class.png cr22-action-kdeprint_addprinter.png Makefile.am cr22-action-kdeprint_configsrv.png 
 
 #>+ 2
 docs-am:
@@ -610,133 +616,133 @@
 #>+ 122
 install-kde-icons:
 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_error.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_completed.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
+	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_report.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-package_utilities.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configmgr.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
+	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
+	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps
+	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-filterstop.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
 	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
 	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer_class.png
-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_queuestate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaultsoft.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printstate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer_infos.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_error.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_enableprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addpseudo.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_users.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configmgr.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addpseudo.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_testprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
+	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps
 	$(INSTALL_DATA) $(srcdir)/cr22-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_computer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_completed.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-filterstop.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-package_utilities.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_stopprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaultsoft.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
+	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_report.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaulthard.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_computer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printstate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_stopprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_queuestate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
 	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_cancelled.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer_infos.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaulthard.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions
 	$(INSTALL_DATA) $(srcdir)/cr32-action-kdeprint_inklevel.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions/kdeprint_inklevel.png
-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_enableprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer_class.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions/kdeprint_inklevel.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
 
 #>+ 15
 force-reedit:
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/cups/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/cups/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -67,7 +67,8 @@
 kdeprint_cups_la_DEPENDENCIES =  \
 	$(top_builddir)/kdeprint/management/libkdeprint_management.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/kdecore/libkdefakes.la
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_cups_la_OBJECTS = cupsinfos.lo ipprequest.lo \
 	kmcupsfactory.lo kmcupsjobmanager.lo kmcupsmanager.lo \
 	kmcupsuimanager.lo kmpropbanners.lo kmwbanners.lo kmwipp.lo \
@@ -192,6 +193,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -306,7 +309,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@
@@ -334,6 +336,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -343,6 +346,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -371,6 +375,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -421,6 +426,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -478,6 +484,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -499,7 +506,7 @@
 				  kptagspage.cpp
 
 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_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
 #>- kdeprint_cups_la_METASOURCES = AUTO
 noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
 		 kmpropbanners.h kmwbanners.h kmwipp.h kmwippselect.h kcupsprinterimpl.h \
@@ -525,12 +532,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -541,8 +548,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -563,9 +570,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -828,7 +835,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1082,18 +1089,18 @@
 mocs: kpimagepage.moc
 
 #>+ 3
-kmwquota.moc: $(srcdir)/kmwquota.h
-	$(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
+kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
+	$(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
 
 #>+ 2
-mocs: kmwquota.moc
+mocs: kmcupsjobmanager.moc
 
 #>+ 3
-kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
-	$(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
+kmwquota.moc: $(srcdir)/kmwquota.h
+	$(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
 
 #>+ 2
-mocs: kmcupsjobmanager.moc
+mocs: kmwquota.moc
 
 #>+ 3
 kmwippprinter.moc: $(srcdir)/kmwippprinter.h
@@ -1139,7 +1146,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
+	-rm -f  kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
 
 #>+ 2
 KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am 
@@ -1152,8 +1159,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1186,7 +1193,7 @@
 
 
 #>+ 11
-kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp  kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
+kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp  kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
 	@echo 'creating kdeprint_cups_la.all_cpp.cpp ...'; \
 	rm -f kdeprint_cups_la.all_cpp.files kdeprint_cups_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kdeprint_cups_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/cups/cups.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/cups/cups.print
@@ -66,3 +66,4 @@
 DetectPrecedence=10
 MimeTypes=application/postscript,application/pdf,image/gif,image/jpeg,image/png,image/x-bmp,image/x-xpm
 PrimaryMimeType=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/cups/cupsdconf2/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/cups/cupsdconf2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -68,7 +68,8 @@
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 #>- cupsdconf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-#>- 	$(am__DEPENDENCIES_1)
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 #>+ 1
 cupsdconf_la_DEPENDENCIES = libkdeinit_cupsdconf.la
 #>- am_cupsdconf_la_OBJECTS = cupsdconf.lo cupsddialog.lo cupsdpage.lo \
@@ -152,6 +153,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -266,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@
@@ -294,6 +296,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -303,6 +306,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -331,6 +335,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -381,6 +386,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -438,6 +444,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -463,7 +470,7 @@
 #>+ 1
 #>- libkdeinit_cupsdconf_la_METASOURCES = AUTO
 cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-#>- cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
+#>- cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 #>+ 1
 cupsdconf_la_LIBADD = libkdeinit_cupsdconf.la
 noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
@@ -483,12 +490,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -499,8 +506,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -521,9 +528,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -710,7 +717,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -907,14 +914,15 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
+libkdeinit_cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 
 #>+ 2
 libkdeinit_cupsdconf_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 3
+#>+ 4
 libkdeinit_cupsdconf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 
 #>+ 9
 am_libkdeinit_cupsdconf_la_OBJECTS = cupsdconf.lo cupsddialog.lo cupsdpage.lo \
@@ -1039,8 +1047,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpd/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -142,6 +142,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -284,6 +285,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -293,6 +295,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -321,6 +324,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -371,6 +375,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -428,6 +433,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -454,12 +460,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -470,8 +476,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -492,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -641,7 +647,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -842,8 +848,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpd/lpd.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpd/lpd.print
@@ -85,3 +85,4 @@
 Comment[zu]=LPR (Isistimu yokushicelela evamile ye-BSD)
 DetectUris=service:/printer,config:/printcap
 DetectPrecedence=5
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/ext/ext.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/ext/ext.print
@@ -82,3 +82,4 @@
 Comment[zh_HK]=使用外部程式進行列印 (通用)
 Comment[zh_TW]=使用外部程式進行列印 (一般)
 Comment[zu]=Shicilela Ngokwedlulela Kuhlelo lwemisebenzi Langaphandle (okukawonke wonke)
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/ext/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/ext/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,8 +60,9 @@
 am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kdeprint_ext_la_DEPENDENCIES =  \
-	$(top_builddir)/kdeprint/libkdeprint.la
+am__DEPENDENCIES_1 =
+kdeprint_ext_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_ext_la_OBJECTS = kmextfactory.lo kmextmanager.lo \
 	kextprinterimpl.lo kmextuimanager.lo
 #>- kdeprint_ext_la_OBJECTS = $(am_kdeprint_ext_la_OBJECTS)
@@ -121,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -235,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@
@@ -263,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -272,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -300,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -350,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -407,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -419,7 +426,7 @@
 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
-kdeprint_ext_la_LIBADD = $(top_builddir)/kdeprint/libkdeprint.la
+kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
 #>- kdeprint_ext_la_METASOURCES = AUTO
 noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
 entry_DATA = ext.print
@@ -430,12 +437,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -446,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -468,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -562,7 +569,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -761,8 +768,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/tools/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/tools/escputil/escputil.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/tools/escputil/escputil.desktop
@@ -27,3 +27,4 @@
 Type=Service
 
 X-KDE-Library=escputil
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/tools/escputil/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/tools/escputil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kdeprint_tool_escputil_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kdeprint_tool_escputil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_tool_escputil_la_OBJECTS = escpwidget.lo
 #>- kdeprint_tool_escputil_la_OBJECTS =  \
 #>- 	$(am_kdeprint_tool_escputil_la_OBJECTS)
@@ -120,6 +121,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -234,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@
@@ -262,6 +264,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -271,6 +274,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -299,6 +303,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -349,6 +354,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -406,6 +412,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -418,7 +425,7 @@
 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
-kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI)
+kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
 noinst_HEADERS = escpwidget.h
 service_DATA = escputil.desktop
 servicedir = $(kde_datadir)/kdeprint/tools
@@ -428,12 +435,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +451,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -557,7 +564,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -767,8 +774,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -117,6 +117,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +260,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +270,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +299,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +350,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +408,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -426,12 +432,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -442,8 +448,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -464,9 +470,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:
@@ -525,7 +531,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -735,8 +741,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpdunix/lpdunix.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpdunix/lpdunix.print
@@ -81,3 +81,4 @@
 Comment[zh_HK]=通用 UNIX LPD 列印系統 (預設)
 Comment[zh_TW]=通用 UNIX LPD 列印系統(預設)
 Comment[zu]=Isistimu Yokushicilela ye-UNIX LPD Kawonke wonke (yokwendalo)
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpdunix/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpdunix/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,8 +60,9 @@
 am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kdeprint_lpdunix_la_DEPENDENCIES =  \
-	$(top_builddir)/kdeprint/management/libkdeprint_management.la
+am__DEPENDENCIES_1 =
+kdeprint_lpdunix_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_lpdunix_la_OBJECTS = kmlpdunixfactory.lo \
 	kmlpdunixmanager.lo klpdunixprinterimpl.lo \
 	kmlpdunixuimanager.lo
@@ -123,6 +124,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -237,7 +240,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,6 +267,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -274,6 +277,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -302,6 +306,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -352,6 +357,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -409,6 +415,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -421,7 +428,7 @@
 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
-kdeprint_lpdunix_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
+kdeprint_lpdunix_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
 #>- kdeprint_lpdunix_la_METASOURCES = AUTO
 noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
 entry_DATA = lpdunix.print
@@ -432,12 +439,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -448,8 +455,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -470,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -564,7 +571,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -763,8 +770,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psbook.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psbook.desktop
@@ -91,3 +91,4 @@
 Comment[zu]=Ibhukwana Lokushicilela (sebenzisa ngecala elincane lukushicilela okuphindwe kabili)
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/ps2pdf.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/ps2pdf.desktop
@@ -90,3 +90,4 @@
 Comment[zu]=Umguquli we-PostScript se-DPF
 MimeTypeIn=application/postscript
 MimeTypeOut=application/pdf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psbook2.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psbook2.desktop
@@ -93,3 +93,4 @@
 Comment[zu]=Ukushicilela Kwebhukwana - Amaphepha Angalingani (isiqendu 2)
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/pdfwrite.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/pdfwrite.desktop
@@ -100,3 +100,4 @@
 Comment[zu]=Umbhali we-PDF (idinga i-Ghostscript)
 MimeTypeIn=application/postscript
 MimeTypeOut=application/pdf
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psresize.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psresize.desktop
@@ -97,3 +97,4 @@
 Comment[zu]=Kala Okuphakathi Kokushicilela Ukugcwalisa Omunye Usayizi Wephepha
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psselect.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psselect.desktop
@@ -95,3 +95,4 @@
 Comment[zu]=Ukhetho Lwephepha/Ukuthumela Isihlaziya samafayela
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -75,6 +75,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -189,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@
@@ -217,6 +218,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -226,6 +228,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -254,6 +257,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -304,6 +308,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -361,6 +366,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -387,12 +393,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -403,8 +409,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -425,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
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -623,8 +629,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/poster.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/poster.desktop
@@ -161,3 +161,4 @@
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
 Require=exec:/poster
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psnup.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psnup.desktop
@@ -87,3 +87,4 @@
 Comment[zu]=Amakhasi Amaningana Kumhlaziyi Wepheshana ngamunye
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/psbook1.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/psbook1.desktop
@@ -92,3 +92,4 @@
 Comment[zu]=Ukushicilela Ibhukwana - Amaphepha Alinganayo (isiqendu 1)
 MimeTypeIn=application/postscript
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/imagetops.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/imagetops.desktop
@@ -105,3 +105,4 @@
 Comment[zu]=Isithombe Sawowonke Sehluzo le-PS
 MimeTypeIn=image/jpeg,image/png,image/x-png,image/bmp,image/x-bmp,image/gif,image/tiff
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/enscript.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/enscript.desktop
@@ -102,3 +102,4 @@
 Comment[zu]=Qopha Ihluzo Lombhalo
 MimeTypeIn=text/html,text/plain,text/sgml,text/x-c++hdr,text/x-c++src,text/x-chdr,text/x-csrc,text/x-java,text/x-makefile,text/x-pascal,text/x-python,text/x-tcl,text/x-tex,text/xml,text/x-fortran,application/x-perl,appication/x-perl-module,application/x-python,text/docbook,text/x-log,text/x-diff,application/x-ruby
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/filters/pdf2ps.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeprint/filters/pdf2ps.desktop
@@ -38,3 +38,4 @@
 Comment[zh_TW]=PDF 至 PostScript 轉換器
 MimeTypeIn=application/pdf
 MimeTypeOut=application/postscript
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpr/lpr.print
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpr/lpr.print
@@ -84,3 +84,4 @@
 Comment[zu]=Isistimu Yokushicilela ye-LPR/LRng
 DetectUris=service:/printer
 DetectPrecedence=0
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/lpr/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/lpr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -64,9 +64,11 @@
 	"$(DESTDIR)$(kdeprintlprdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 kdeprint_lpr_la_DEPENDENCIES =  \
 	$(top_builddir)/kdeprint/management/libkdeprint_management.la \
-	$(top_builddir)/kdecore/libkdefakes.la
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdeprint_lpr_la_OBJECTS = printcapreader.lo lprhandler.lo \
 	matichandler.lo klprfactory.lo kmlprmanager.lo \
 	kmlpruimanager.lo lpchelper.lo lpqhelper.lo kmlprjobmanager.lo \
@@ -97,7 +99,6 @@
 #>- make_driver_db_lpr_OBJECTS = $(am_make_driver_db_lpr_OBJECTS)
 #>+ 1
 make_driver_db_lpr_OBJECTS = make_driver_db_lpr.$(OBJEXT)
-am__DEPENDENCIES_1 =
 make_driver_db_lpr_DEPENDENCIES =  \
 	$(top_builddir)/kdecore/libkdefakes.la ../libdriverparse.a \
 	$(am__DEPENDENCIES_1)
@@ -159,6 +160,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -273,7 +276,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,6 +303,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -310,6 +313,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -338,6 +342,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -388,6 +393,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -445,6 +451,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -465,7 +472,9 @@
 			     editentrydialog.cpp
 
 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_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la \
+    $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
+
 #>- kdeprint_lpr_la_METASOURCES = AUTO
 noinst_HEADERS = printcapreader.h \
 		 matichandler.h kmlprmanager.h \
@@ -490,12 +499,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -506,8 +515,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -528,9 +537,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -722,7 +731,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -946,8 +955,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeprint/management/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeprint/management/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -68,7 +68,10 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(kdeinit_LTLIBRARIES) \
 	$(lib_LTLIBRARIES)
-#>- kaddprinterwizard_la_DEPENDENCIES = libkdeprint_management.la
+am__DEPENDENCIES_1 =
+#>- kaddprinterwizard_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1)
 #>+ 1
 kaddprinterwizard_la_DEPENDENCIES = libkdeinit_kaddprinterwizard.la
 #>- am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
@@ -84,7 +87,9 @@
 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
+libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
 	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
 	kmpages.lo kmprinterview.lo kmjobviewer.lo jobitem.lo \
@@ -135,7 +140,8 @@
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(libkdeprint_management_la_LDFLAGS) $(LDFLAGS) -o $@
 libkdeprint_management_module_la_DEPENDENCIES =  \
-	libkdeprint_management.la
+	libkdeprint_management.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkdeprint_management_module_la_OBJECTS =  \
 	kdeprint_management_module.lo
 #>- libkdeprint_management_module_la_OBJECTS =  \
@@ -212,6 +218,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -326,7 +334,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,6 +361,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -363,6 +371,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -391,6 +400,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -441,6 +451,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -498,6 +509,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -513,7 +525,7 @@
 kde_module_LTLIBRARIES = libkdeprint_management_module.la
 kdeinit_LTLIBRARIES = kaddprinterwizard.la
 kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-#>- kaddprinterwizard_la_LIBADD = libkdeprint_management.la
+#>- kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
 #>+ 1
 kaddprinterwizard_la_LIBADD = libkdeinit_kaddprinterwizard.la
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
@@ -533,11 +545,11 @@
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
 
 libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkdeprint_management_la_LIBADD = ../libkdeprint.la
+libkdeprint_management_la_LIBADD = ../libkdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
 #>- 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
-libkdeprint_management_module_la_LIBADD = libkdeprint_management.la
+libkdeprint_management_module_la_LIBADD = libkdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
 kdeprintdir = $(includedir)/kdeprint
 noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
@@ -559,12 +571,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -575,8 +587,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -597,9 +609,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -848,7 +860,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1050,13 +1062,15 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kaddprinterwizard_la_LIBADD = libkdeprint_management.la
+libkdeinit_kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
 
 #>+ 2
 libkdeinit_kaddprinterwizard_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kaddprinterwizard_la_DEPENDENCIES = libkdeprint_management.la
+#>+ 4
+libkdeinit_kaddprinterwizard_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
@@ -1118,18 +1132,25 @@
 mocs: kmwclass.moc
 
 #>+ 3
-kmconfigpage.moc: $(srcdir)/kmconfigpage.h
-	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+pluginaction.moc: $(srcdir)/pluginaction.h
+	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
 
 #>+ 2
-mocs: kmconfigpage.moc
+mocs: pluginaction.moc
 
 #>+ 3
-kmwizardpage.moc: $(srcdir)/kmwizardpage.h
-	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
+kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
+	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
 
 #>+ 2
-mocs: kmwizardpage.moc
+mocs: kmwdriverselect.moc
+
+#>+ 3
+kmconfigpage.moc: $(srcdir)/kmconfigpage.h
+	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+
+#>+ 2
+mocs: kmconfigpage.moc
 
 #>+ 3
 kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
@@ -1139,18 +1160,18 @@
 mocs: kxmlcommanddlg.moc
 
 #>+ 3
-pluginaction.moc: $(srcdir)/pluginaction.h
-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
+kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
 
 #>+ 2
-mocs: pluginaction.moc
+mocs: kmwizardpage.moc
 
 #>+ 3
-kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
-	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
+kmdbcreator.moc: $(srcdir)/kmdbcreator.h
+	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
 
 #>+ 2
-mocs: kmwdriverselect.moc
+mocs: kmdbcreator.moc
 
 #>+ 3
 kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
@@ -1160,13 +1181,6 @@
 mocs: kmdriverdbwidget.moc
 
 #>+ 3
-kmdbcreator.moc: $(srcdir)/kmdbcreator.h
-	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
-
-#>+ 2
-mocs: kmdbcreator.moc
-
-#>+ 3
 kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
 	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
 
@@ -1188,18 +1202,18 @@
 mocs: kmmainview.moc
 
 #>+ 3
-kmpropwidget.moc: $(srcdir)/kmpropwidget.h
-	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+kmwizard.moc: $(srcdir)/kmwizard.h
+	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
 
 #>+ 2
-mocs: kmpropwidget.moc
+mocs: kmwizard.moc
 
 #>+ 3
-kmwizard.moc: $(srcdir)/kmwizard.h
-	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
+kmpropwidget.moc: $(srcdir)/kmpropwidget.h
+	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
 
 #>+ 2
-mocs: kmwizard.moc
+mocs: kmpropwidget.moc
 
 #>+ 3
 cjanuswidget.moc: $(srcdir)/cjanuswidget.h
@@ -1258,18 +1272,18 @@
 mocs: kmconfiggeneral.moc
 
 #>+ 3
-kmprinterview.moc: $(srcdir)/kmprinterview.h
-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
+kmwlocal.moc: $(srcdir)/kmwlocal.h
+	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
 
 #>+ 2
-mocs: kmprinterview.moc
+mocs: kmwlocal.moc
 
 #>+ 3
-kmwlocal.moc: $(srcdir)/kmwlocal.h
-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
+kmprinterview.moc: $(srcdir)/kmprinterview.h
+	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
 
 #>+ 2
-mocs: kmwlocal.moc
+mocs: kmprinterview.moc
 
 #>+ 3
 smbview.moc: $(srcdir)/smbview.h
@@ -1286,18 +1300,18 @@
 mocs: kmconfigjobs.moc
 
 #>+ 3
-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+networkscanner.moc: $(srcdir)/networkscanner.h
+	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
 
 #>+ 2
-mocs: kmdriverdb.moc
+mocs: networkscanner.moc
 
 #>+ 3
-networkscanner.moc: $(srcdir)/networkscanner.h
-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
+kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
 
 #>+ 2
-mocs: networkscanner.moc
+mocs: kmdriverdb.moc
 
 #>+ 3
 kmwsocket.moc: $(srcdir)/kmwsocket.h
@@ -1336,7 +1350,7 @@
 
 #>+ 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
+	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc pluginaction.moc kmwdriverselect.moc kmconfigpage.moc kxmlcommanddlg.moc kmwizardpage.moc kmdbcreator.moc kmdriverdbwidget.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.moc
 
 #>+ 2
 KDE_DIST=Makefile.in side.png tileup.png tiledown.png Makefile.am 
@@ -1349,8 +1363,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1383,7 +1397,7 @@
 
 
 #>+ 11
-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.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 kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmconfigjobs.moc kmdriverdb.moc networkscanner.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
+libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc pluginaction.moc kmwdriverselect.moc kmconfigpage.moc kxmlcommanddlg.moc kmwizardpage.moc kmdbcreator.moc kmdriverdbwidget.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
 	@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
@@ -1451,12 +1465,12 @@
 kmlistview.lo: kmlistview.moc 
 kmwsocketutil.lo: kmwsocketutil.moc 
 kmconfigdialog.lo: kmconfigdialog.moc 
-kmdriverdbwidget.lo: kmdriverdbwidget.moc 
 kmdbcreator.lo: kmdbcreator.moc 
+kmdriverdbwidget.lo: kmdriverdbwidget.moc 
 kmjobviewer.o: kmjobviewer.moc 
 kmpropcontainer.lo: kmpropcontainer.moc 
-kmwizardpage.o: kmwizardpage.moc 
 kmwclass.o: kmwclass.moc 
+kmwizardpage.o: kmwizardpage.moc 
 kmwdriverselect.lo: kmwdriverselect.moc 
 kmdriverdbwidget.o: kmdriverdbwidget.moc 
 pluginaction.lo: pluginaction.moc 
@@ -1492,19 +1506,19 @@
 kmprinterview.lo: kmprinterview.moc 
 kmtimer.lo: kmtimer.moc 
 kmconfigjobs.o: kmconfigjobs.moc 
-kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
 kmdriverdb.lo: kmdriverdb.moc 
+kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
 kmconfigpage.lo: kmconfigpage.moc 
 kmdriverdb.o: kmdriverdb.moc 
 kmjobviewer.lo: kmjobviewer.moc 
 kmwizard.o: kmwizard.moc 
 nmcheck: 
-networkscanner.o: networkscanner.moc 
 kmpropwidget.lo: kmpropwidget.moc 
+networkscanner.o: networkscanner.moc 
 kmconfiggeneral.o: kmconfiggeneral.moc 
 kmwsmb.lo: kmwsmb.moc 
 kmiconview.lo: kmiconview.moc 
 kminstancepage.o: kminstancepage.moc 
-kmwdriverselect.o: kmwdriverselect.moc 
 kmpropcontainer.o: kmpropcontainer.moc 
+kmwdriverselect.o: kmwdriverselect.moc 
 kmdriverdialog.lo: kmdriverdialog.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/eventsrc
+++ kdelibs-3.5.10.dfsg.1/kdecore/eventsrc
@@ -2739,3 +2739,5 @@
 nopresentation=18
 
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/all_languages.desktop
+++ kdelibs-3.5.10.dfsg.1/kdecore/all_languages.desktop
@@ -11917,3 +11917,4 @@
 Name[zh_HK]=袓魯語
 Name[zh_TW]=袓魯語
 Name[zu]=Isi-Zulu
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -100,15 +100,22 @@
 	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)
 am__DEPENDENCIES_1 =
 libkdecore_la_DEPENDENCIES = malloc/libklmalloc.la \
 	network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la \
 	../libltdl/libltdlc.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kdefx/libkdefx.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	../kdefx/libkdefx.la
+	$(am__DEPENDENCIES_1)
 am_libkdecore_la_OBJECTS = libintl.lo kapplication.lo kdebug.lo \
 	netwm.lo kconfigbase.lo kconfig.lo ksimpleconfig.lo \
 	kconfigbackend.lo kmanagerselection.lo kdesktopfile.lo \
@@ -212,7 +219,7 @@
 #>- kgrantpty_OBJECTS = $(am_kgrantpty_OBJECTS)
 #>+ 1
 kgrantpty_OBJECTS = kgrantpty-kgrantpty.$(OBJEXT)
-kgrantpty_DEPENDENCIES = ./libkdefakes.la
+kgrantpty_LDADD = $(LDADD)
 kgrantpty_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(kgrantpty_CFLAGS) \
 	$(CFLAGS) $(kgrantpty_LDFLAGS) $(LDFLAGS) -o $@
@@ -248,10 +255,10 @@
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--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) \
+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 \
@@ -292,6 +299,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -406,7 +415,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@
@@ -434,6 +442,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -443,6 +452,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,6 +481,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -521,6 +532,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -578,6 +590,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -594,7 +607,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 \
@@ -697,7 +710,9 @@
 	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
-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_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
+	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libkdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+
 libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
 libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
@@ -721,7 +736,6 @@
 kgrantpty_SOURCES = kgrantpty.c
 kgrantpty_CFLAGS = $(KDE_USE_FPIE)
 kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
-kgrantpty_LDADD = ./libkdefakes.la
 DISTCLEANFILES = kde-config.cpp
 DOXYGEN_REFERENCES = dcop kdeui kparts kio
 DOXYGEN_EXCLUDE = malloc kde_file.h
@@ -733,12 +747,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -749,8 +763,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -771,9 +785,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
 
 kdemacros.h: stamp-h3
@@ -785,7 +799,7 @@
 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 $@
@@ -1005,6 +1019,7 @@
 @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@
@@ -1198,7 +1213,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1438,6 +1453,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))
@@ -1628,18 +1649,18 @@
 mocs: kshortcutmenu.moc
 
 #>+ 3
-kprocio.moc: $(srcdir)/kprocio.h
-	$(MOC) $(srcdir)/kprocio.h -o kprocio.moc
+kapplication.moc: $(srcdir)/kapplication.h
+	$(MOC) $(srcdir)/kapplication.h -o kapplication.moc
 
 #>+ 2
-mocs: kprocio.moc
+mocs: kapplication.moc
 
 #>+ 3
-kapplication.moc: $(srcdir)/kapplication.h
-	$(MOC) $(srcdir)/kapplication.h -o kapplication.moc
+kprocio.moc: $(srcdir)/kprocio.h
+	$(MOC) $(srcdir)/kprocio.h -o kprocio.moc
 
 #>+ 2
-mocs: kapplication.moc
+mocs: kprocio.moc
 
 #>+ 3
 kconfig.moc: $(srcdir)/kconfig.h
@@ -1796,18 +1817,18 @@
 mocs: klibloader.moc
 
 #>+ 3
-kdesktopfile.moc: $(srcdir)/kdesktopfile.h
-	$(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
+ksycoca.moc: $(srcdir)/ksycoca.h
+	$(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
 
 #>+ 2
-mocs: kdesktopfile.moc
+mocs: ksycoca.moc
 
 #>+ 3
-ksycoca.moc: $(srcdir)/ksycoca.h
-	$(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
+kdesktopfile.moc: $(srcdir)/kdesktopfile.h
+	$(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
 
 #>+ 2
-mocs: ksycoca.moc
+mocs: kdesktopfile.moc
 
 #>+ 3
 kaccelprivate.moc: $(srcdir)/kaccelprivate.h
@@ -1825,7 +1846,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
+	-rm -f  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kapplication.moc kprocio.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
 
 #>+ 2
 KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles Web.colors kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h Rainbow.colors kdebugrc 40.colors kdebug.areas kdebugdcopiface.h Royal.colors kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in 
@@ -1845,8 +1866,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1879,7 +1900,7 @@
 
 
 #>+ 11
-libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp  kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
+libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp  kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kapplication.moc kprocio.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
 	@echo 'creating libkdecore_la.all_cpp.cpp ...'; \
 	rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/svgicons/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/svgicons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -108,6 +108,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -222,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@
@@ -250,6 +251,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -259,6 +261,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -287,6 +290,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -337,6 +341,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -394,6 +399,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -411,12 +417,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -427,8 +433,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -449,9 +455,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:
@@ -523,7 +529,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -717,8 +723,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/malloc/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/malloc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -105,6 +105,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -219,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@
@@ -247,6 +248,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -256,6 +258,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -284,6 +287,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -334,6 +338,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -391,6 +396,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -409,12 +415,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -425,8 +431,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -447,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-noinstLTLIBRARIES:
@@ -503,7 +509,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -693,8 +699,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -406,6 +406,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -520,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@
@@ -548,6 +549,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -557,6 +559,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -585,6 +588,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -635,6 +639,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -692,6 +697,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -759,12 +765,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -775,8 +781,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -797,9 +803,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:
@@ -1008,7 +1014,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1051,7 +1057,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -1062,7 +1068,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -1074,7 +1080,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -1088,23 +1094,36 @@
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -1267,18 +1286,18 @@
 .NOEXPORT:
 
 #>+ 3
-kconfigtestgui.moc: $(srcdir)/kconfigtestgui.h
-	$(MOC) $(srcdir)/kconfigtestgui.h -o kconfigtestgui.moc
+kprocesstest.moc: $(srcdir)/kprocesstest.h
+	$(MOC) $(srcdir)/kprocesstest.h -o kprocesstest.moc
 
 #>+ 2
-mocs: kconfigtestgui.moc
+mocs: kprocesstest.moc
 
 #>+ 3
-kprocesstest.moc: $(srcdir)/kprocesstest.h
-	$(MOC) $(srcdir)/kprocesstest.h -o kprocesstest.moc
+kconfigtestgui.moc: $(srcdir)/kconfigtestgui.h
+	$(MOC) $(srcdir)/kconfigtestgui.h -o kconfigtestgui.moc
 
 #>+ 2
-mocs: kprocesstest.moc
+mocs: kconfigtestgui.moc
 
 #>+ 3
 kprociotest.moc: $(srcdir)/kprociotest.h
@@ -1313,7 +1332,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kconfigtestgui.moc kprocesstest.moc kprociotest.moc kipctest.moc klocaletest.moc
+	-rm -f  kprocesstest.moc kconfigtestgui.moc kprociotest.moc kipctest.moc klocaletest.moc
 
 #>+ 2
 KDE_DIST=Makefile.in kconfigtestgui.h Makefile.am 
@@ -1332,8 +1351,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/network/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/network/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -123,6 +123,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -265,6 +266,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -274,6 +276,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -302,6 +305,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -352,6 +356,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -409,6 +414,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -481,12 +487,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -497,8 +503,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -519,9 +525,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:
@@ -625,7 +631,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -845,13 +851,6 @@
 mocs: kstreamsocket.moc
 
 #>+ 3
-kdatagramsocket.moc: $(srcdir)/kdatagramsocket.h
-	$(MOC) $(srcdir)/kdatagramsocket.h -o kdatagramsocket.moc
-
-#>+ 2
-mocs: kdatagramsocket.moc
-
-#>+ 3
 kresolver.moc: $(srcdir)/kresolver.h
 	$(MOC) $(srcdir)/kresolver.h -o kresolver.moc
 
@@ -866,8 +865,15 @@
 mocs: kclientsocketbase.moc
 
 #>+ 3
+kdatagramsocket.moc: $(srcdir)/kdatagramsocket.h
+	$(MOC) $(srcdir)/kdatagramsocket.h -o kdatagramsocket.moc
+
+#>+ 2
+mocs: kdatagramsocket.moc
+
+#>+ 3
 clean-metasources:
-	-rm -f  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kdatagramsocket.moc kresolver.moc kclientsocketbase.moc
+	-rm -f  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kresolver.moc kclientsocketbase.moc kdatagramsocket.moc
 
 #>+ 2
 KDE_DIST=Makefile.in ipv6blacklist Makefile.am 
@@ -880,8 +886,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -914,7 +920,7 @@
 
 
 #>+ 11
-libkdecorenetwork_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kresolver.cpp $(srcdir)/kresolvermanager.cpp $(srcdir)/kresolverworkerbase.cpp $(srcdir)/ksocketaddress.cpp $(srcdir)/kresolverstandardworkers.cpp $(srcdir)/kreverseresolver.cpp $(srcdir)/ksocketdevice.cpp $(srcdir)/ksocketbase.cpp $(srcdir)/kclientsocketbase.cpp $(srcdir)/kstreamsocket.cpp $(srcdir)/kserversocket.cpp $(srcdir)/kdatagramsocket.cpp $(srcdir)/khttpproxysocketdevice.cpp $(srcdir)/ksockssocketdevice.cpp $(srcdir)/kbufferedsocket.cpp $(srcdir)/ksocketbuffer.cpp $(srcdir)/ksrvresolverworker.cpp  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kdatagramsocket.moc kresolver.moc kclientsocketbase.moc
+libkdecorenetwork_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kresolver.cpp $(srcdir)/kresolvermanager.cpp $(srcdir)/kresolverworkerbase.cpp $(srcdir)/ksocketaddress.cpp $(srcdir)/kresolverstandardworkers.cpp $(srcdir)/kreverseresolver.cpp $(srcdir)/ksocketdevice.cpp $(srcdir)/ksocketbase.cpp $(srcdir)/kclientsocketbase.cpp $(srcdir)/kstreamsocket.cpp $(srcdir)/kserversocket.cpp $(srcdir)/kdatagramsocket.cpp $(srcdir)/khttpproxysocketdevice.cpp $(srcdir)/ksockssocketdevice.cpp $(srcdir)/kbufferedsocket.cpp $(srcdir)/ksocketbuffer.cpp $(srcdir)/ksrvresolverworker.cpp  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kresolver.moc kclientsocketbase.moc kdatagramsocket.moc
 	@echo 'creating libkdecorenetwork_la.all_cpp.cpp ...'; \
 	rm -f libkdecorenetwork_la.all_cpp.files libkdecorenetwork_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdecorenetwork_la.all_cpp.final; \
@@ -964,7 +970,7 @@
 kdatagramsocket.o: kdatagramsocket.moc 
 kreverseresolver.o: kreverseresolver.moc 
 ksrvresolverworker.lo: ksrvresolverworker_p.moc 
-kdatagramsocket.lo: kdatagramsocket.moc 
 kclientsocketbase.o: kclientsocketbase.moc 
+kdatagramsocket.lo: kdatagramsocket.moc 
 kresolver.o: kresolver.moc 
 kclientsocketbase.lo: kclientsocketbase.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/kconfig_compiler/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/kconfig_compiler/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -123,6 +123,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -265,6 +266,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -274,6 +276,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -302,6 +305,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -352,6 +356,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -409,6 +414,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -428,12 +434,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +450,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -612,7 +618,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -845,8 +851,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/kconfig_compiler/example/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/kconfig_compiler/example/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -122,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -236,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@
@@ -264,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -273,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -301,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -351,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -408,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -435,12 +441,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -451,8 +457,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -473,9 +479,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:
@@ -533,7 +539,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -741,8 +747,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdecore/kconfig_compiler/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdecore/kconfig_compiler/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -270,6 +270,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -384,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@
@@ -412,6 +413,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -421,6 +423,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -449,6 +452,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -499,6 +503,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -556,6 +561,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -620,12 +626,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -636,8 +642,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -658,9 +664,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
@@ -772,7 +778,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1024,7 +1030,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test_dpointer.cpp.ref test8a.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test7.kcfgc test9.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
+KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test_dpointer.cpp.ref test8a.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
 
 #>+ 2
 docs-am:
@@ -1034,8 +1040,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kcmshell/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kcmshell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,7 +83,11 @@
 kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-#>- kcmshell_la_DEPENDENCIES = ../kutils/libkutils.la
+am__DEPENDENCIES_1 =
+#>- kcmshell_la_DEPENDENCIES = ../kutils/libkutils.la \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1)
 #>+ 1
 kcmshell_la_DEPENDENCIES = libkdeinit_kcmshell.la
 #>- am_kcmshell_la_OBJECTS = main.lo
@@ -149,6 +153,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -263,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@
@@ -291,6 +296,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -300,6 +306,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -328,6 +335,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -378,6 +386,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -435,6 +444,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -452,7 +462,7 @@
 #>+ 2
 kcmshell_la_SOURCES = kcmshell_la_dummy.cpp
 libkdeinit_kcmshell_la_SOURCES = main.cpp  main_skel.cpp
-#>- kcmshell_la_LIBADD = ../kutils/libkutils.la
+#>- kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
 #>+ 1
 kcmshell_la_LIBADD = libkdeinit_kcmshell.la
 kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -463,12 +473,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -479,8 +489,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -501,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
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -630,7 +640,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -916,13 +926,16 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kcmshell_la_LIBADD = ../kutils/libkutils.la
+libkdeinit_kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
 
 #>+ 2
 libkdeinit_kcmshell_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kcmshell_la_DEPENDENCIES = ../kutils/libkutils.la
+#>+ 5
+libkdeinit_kcmshell_la_DEPENDENCIES = ../kutils/libkutils.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_kcmshell_la_OBJECTS = main.lo
@@ -974,8 +987,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kab/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kab/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -105,6 +105,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -219,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@
@@ -247,6 +248,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -256,6 +258,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -284,6 +287,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -334,6 +338,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -391,6 +396,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -416,12 +422,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -432,8 +438,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -454,9 +460,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:
@@ -512,7 +518,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -692,18 +698,18 @@
 .NOEXPORT:
 
 #>+ 3
-kabapi.moc: $(srcdir)/kabapi.h
-	$(MOC) $(srcdir)/kabapi.h -o kabapi.moc
+qconfigDB.moc: $(srcdir)/qconfigDB.h
+	$(MOC) $(srcdir)/qconfigDB.h -o qconfigDB.moc
 
 #>+ 2
-mocs: kabapi.moc
+mocs: qconfigDB.moc
 
 #>+ 3
-qconfigDB.moc: $(srcdir)/qconfigDB.h
-	$(MOC) $(srcdir)/qconfigDB.h -o qconfigDB.moc
+kabapi.moc: $(srcdir)/kabapi.h
+	$(MOC) $(srcdir)/kabapi.h -o kabapi.moc
 
 #>+ 2
-mocs: qconfigDB.moc
+mocs: kabapi.moc
 
 #>+ 3
 addressbook.moc: $(srcdir)/addressbook.h
@@ -714,7 +720,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kabapi.moc qconfigDB.moc addressbook.moc
+	-rm -f  qconfigDB.moc kabapi.moc addressbook.moc
 
 #>+ 2
 KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am 
@@ -727,8 +733,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -761,7 +767,7 @@
 
 
 #>+ 11
-libkab_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kabapi.cc $(srcdir)/addressbook.cc $(srcdir)/qconfigDB.cc  qconfigDB.moc kabapi.moc addressbook.moc
+libkab_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kabapi.cc $(srcdir)/addressbook.cc $(srcdir)/qconfigDB.cc  kabapi.moc qconfigDB.moc addressbook.moc
 	@echo 'creating libkab_la.all_cc.cc ...'; \
 	rm -f libkab_la.all_cc.files libkab_la.all_cc.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kwallet/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kwallet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,6 +83,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -197,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@
@@ -225,6 +226,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -234,6 +236,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -262,6 +265,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -312,6 +316,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -369,6 +374,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -384,12 +390,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -400,8 +406,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -422,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:
@@ -508,7 +514,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -817,8 +823,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kwallet/client/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kwallet/client/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkwalletclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkwalletclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 am_libkwalletclient_la_OBJECTS = kwallet.lo
 #>- libkwalletclient_la_OBJECTS = $(am_libkwalletclient_la_OBJECTS)
 #>+ 4
@@ -117,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,7 +420,7 @@
 INCLUDES = -I$(srcdir) $(all_includes)
 lib_LTLIBRARIES = libkwalletclient.la
 libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-libkwalletclient_la_LIBADD = $(LIB_KDECORE)
+libkwalletclient_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 #>- libkwalletclient_la_SOURCES = kwallet.skel \
 #>- 				kwallet.cc
 #>+ 2
@@ -428,12 +435,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +451,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -557,7 +564,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -774,8 +781,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kwallet/backend/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kwallet/backend/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -119,6 +119,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -233,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@
@@ -261,6 +262,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +272,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +301,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +352,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +410,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -438,12 +444,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -454,8 +460,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -476,9 +482,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -555,7 +561,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -749,8 +755,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kwallet/backend/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kwallet/backend/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -110,6 +110,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -224,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@
@@ -252,6 +253,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -261,6 +263,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -289,6 +292,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -339,6 +343,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -396,6 +401,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -416,12 +422,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -432,8 +438,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -454,9 +460,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:
@@ -517,7 +523,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -709,8 +715,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kwallet/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kwallet/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -140,6 +140,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -282,6 +283,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -291,6 +293,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -319,6 +322,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -369,6 +373,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -426,6 +431,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -457,12 +463,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -473,8 +479,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -495,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-checkPROGRAMS:
@@ -559,7 +565,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -762,8 +768,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -84,6 +84,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -198,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@
@@ -226,6 +227,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -235,6 +237,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -263,6 +266,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -313,6 +317,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -370,6 +375,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -385,12 +391,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -401,8 +407,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -423,9 +429,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:
@@ -509,7 +515,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -823,8 +829,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/part/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/part/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -89,10 +89,13 @@
 @KDE_USE_FINAL_TRUE@libkate_la_OBJECTS = $(libkate_la_final_OBJECTS)
 am__DEPENDENCIES_1 =
 libkatepart_la_DEPENDENCIES = libkate.la \
-	../interfaces/libkatepartinterfaces.la \
-	$(top_builddir)/kdeprint/libkdeprint.la \
+	../interfaces/libkatepartinterfaces.la $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1)
+	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 am_libkatepart_la_OBJECTS = dummy.lo
 #>- libkatepart_la_OBJECTS = $(am_libkatepart_la_OBJECTS)
 #>+ 1
@@ -109,9 +112,12 @@
 #>+ 1
 testkateregression_OBJECTS = test_regression.$(OBJEXT)
 am__DEPENDENCIES_2 = libkate.la ../interfaces/libkatepartinterfaces.la \
-	$(top_builddir)/kdeprint/libkdeprint.la \
-	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(top_builddir)/kutils/libkutils.la \
+	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 testkateregression_DEPENDENCIES = $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@@ -155,6 +161,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -269,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@
@@ -297,6 +304,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -306,6 +314,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -334,6 +343,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -384,6 +394,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -441,6 +452,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -475,7 +487,7 @@
   kateluaindentscript.cpp katedocument_skel.cpp
 
 libkatepart_la_SOURCES = dummy.cpp
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(top_builddir)/kdeprint/libkdeprint.la $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS)
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_KDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
 libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 INCLUDES = -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/interfaces  -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/kdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
 #>- METASOURCES = AUTO
@@ -490,12 +502,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -506,8 +518,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -528,9 +540,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -658,7 +670,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -701,7 +713,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -712,7 +724,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -724,7 +736,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -738,23 +750,36 @@
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -966,18 +991,18 @@
 mocs: katetemplatehandler.moc
 
 #>+ 3
-kateviewinternal.moc: $(srcdir)/kateviewinternal.h
-	$(MOC) $(srcdir)/kateviewinternal.h -o kateviewinternal.moc
+kateschema.moc: $(srcdir)/kateschema.h
+	$(MOC) $(srcdir)/kateschema.h -o kateschema.moc
 
 #>+ 2
-mocs: kateviewinternal.moc
+mocs: kateschema.moc
 
 #>+ 3
-kateschema.moc: $(srcdir)/kateschema.h
-	$(MOC) $(srcdir)/kateschema.h -o kateschema.moc
+kateviewinternal.moc: $(srcdir)/kateviewinternal.h
+	$(MOC) $(srcdir)/kateviewinternal.h -o kateviewinternal.moc
 
 #>+ 2
-mocs: kateschema.moc
+mocs: kateviewinternal.moc
 
 #>+ 3
 test_regression.moc: $(srcdir)/test_regression.h
@@ -987,18 +1012,18 @@
 mocs: test_regression.moc
 
 #>+ 3
-katedialogs.moc: $(srcdir)/katedialogs.h
-	$(MOC) $(srcdir)/katedialogs.h -o katedialogs.moc
+katedocumenthelpers.moc: $(srcdir)/katedocumenthelpers.h
+	$(MOC) $(srcdir)/katedocumenthelpers.h -o katedocumenthelpers.moc
 
 #>+ 2
-mocs: katedialogs.moc
+mocs: katedocumenthelpers.moc
 
 #>+ 3
-katedocumenthelpers.moc: $(srcdir)/katedocumenthelpers.h
-	$(MOC) $(srcdir)/katedocumenthelpers.h -o katedocumenthelpers.moc
+katedialogs.moc: $(srcdir)/katedialogs.h
+	$(MOC) $(srcdir)/katedialogs.h -o katedialogs.moc
 
 #>+ 2
-mocs: katedocumenthelpers.moc
+mocs: katedialogs.moc
 
 #>+ 3
 kateviewhelpers.moc: $(srcdir)/kateviewhelpers.h
@@ -1086,7 +1111,7 @@
 
 #>+ 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
+	-rm -f  katecodecompletion.moc katedocument.moc katefiletype.moc katetemplatehandler.moc kateschema.moc kateviewinternal.moc test_regression.moc katedocumenthelpers.moc katedialogs.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
 
 #>+ 2
 KDE_DIST=katetextline.h kateindentscriptabstracts.h kateviewhelpers.h kateschema.h test_regression.h kateview.h katespell.h katearbitraryhighlight.h kateviewinternal.h kateundo.h katedocument.h katecodefoldinghelpers.h katecodecompletion.h katekeyinterceptorfunctor.h katecmds.h katefactory.h Makefile.in katejscript.h kateautoindent.h katebuffer.h katedocumenthelpers.h katerenderer.h katehighlight.h kateconfig.h kateluaindentscript.h katesyntaxdocument.h katesearch.h kateprinter.h katecursor.h kateattribute.h katetemplatehandler.h katebookmarks.h katedialogs.h configure.in.in katefiletype.h katefont.h katelinerange.h Makefile.am katesupercursor.h 
@@ -1104,8 +1129,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1138,7 +1163,7 @@
 
 
 #>+ 11
-libkate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katesearch.cpp $(srcdir)/katebuffer.cpp $(srcdir)/katecmds.cpp $(srcdir)/kateundo.cpp $(srcdir)/katecursor.cpp $(srcdir)/katedialogs.cpp $(srcdir)/katedocument.cpp $(srcdir)/katefactory.cpp $(srcdir)/katehighlight.cpp $(srcdir)/katesyntaxdocument.cpp $(srcdir)/katetextline.cpp $(srcdir)/kateview.cpp $(srcdir)/kateconfig.cpp $(srcdir)/kateviewhelpers.cpp $(srcdir)/katecodecompletion.cpp $(srcdir)/katedocumenthelpers.cpp $(srcdir)/katecodefoldinghelpers.cpp $(srcdir)/kateviewinternal.cpp $(srcdir)/katebookmarks.cpp $(srcdir)/kateprinter.cpp $(srcdir)/katefont.cpp $(srcdir)/katelinerange.cpp $(srcdir)/katesupercursor.cpp $(srcdir)/katearbitraryhighlight.cpp $(srcdir)/katerenderer.cpp $(srcdir)/kateattribute.cpp $(srcdir)/kateautoindent.cpp $(srcdir)/katefiletype.cpp $(srcdir)/kateschema.cpp $(srcdir)/katetemplatehandler.cpp $(srcdir)/katejscript.cpp  katejscript.lut.h $(srcdir)/katespell.cpp $(srcdir)/kateindentscriptabstracts.cpp $(srcdir)/kateluaindentscript.cpp katedocument_skel.cpp  katecodecompletion.moc katefiletype.moc katedocument.moc katetemplatehandler.moc kateviewinternal.moc kateschema.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
+libkate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katesearch.cpp $(srcdir)/katebuffer.cpp $(srcdir)/katecmds.cpp $(srcdir)/kateundo.cpp $(srcdir)/katecursor.cpp $(srcdir)/katedialogs.cpp $(srcdir)/katedocument.cpp $(srcdir)/katefactory.cpp $(srcdir)/katehighlight.cpp $(srcdir)/katesyntaxdocument.cpp $(srcdir)/katetextline.cpp $(srcdir)/kateview.cpp $(srcdir)/kateconfig.cpp $(srcdir)/kateviewhelpers.cpp $(srcdir)/katecodecompletion.cpp $(srcdir)/katedocumenthelpers.cpp $(srcdir)/katecodefoldinghelpers.cpp $(srcdir)/kateviewinternal.cpp $(srcdir)/katebookmarks.cpp $(srcdir)/kateprinter.cpp $(srcdir)/katefont.cpp $(srcdir)/katelinerange.cpp $(srcdir)/katesupercursor.cpp $(srcdir)/katearbitraryhighlight.cpp $(srcdir)/katerenderer.cpp $(srcdir)/kateattribute.cpp $(srcdir)/kateautoindent.cpp $(srcdir)/katefiletype.cpp $(srcdir)/kateschema.cpp $(srcdir)/katetemplatehandler.cpp $(srcdir)/katejscript.cpp  katejscript.lut.h $(srcdir)/katespell.cpp $(srcdir)/kateindentscriptabstracts.cpp $(srcdir)/kateluaindentscript.cpp katedocument_skel.cpp  katecodecompletion.moc katefiletype.moc katedocument.moc katetemplatehandler.moc kateschema.moc kateviewinternal.moc katedocumenthelpers.moc katedialogs.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
 	@echo 'creating libkate_la.all_cpp.cpp ...'; \
 	rm -f libkate_la.all_cpp.files libkate_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkate_la.all_cpp.final; \
@@ -1216,5 +1241,5 @@
 katefiletype.o: katefiletype.moc 
 kateautoindent.lo: kateautoindent.moc 
 katecodefoldinghelpers.o: katecodefoldinghelpers.moc 
-katedialogs.lo: katedialogs.moc 
 kateviewinternal.lo: kateviewinternal.moc 
+katedialogs.lo: katedialogs.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kate/scripts/jstest.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/scripts/jstest.desktop
@@ -117,3 +117,4 @@
 Comment[zh_TW]=測試 kate part 的文稿
 X-Kate-Command=jstest
 X-Kate-Help=<p>Usage: <code>jstest</code></p>
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/scripts/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -74,6 +74,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -188,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@
@@ -216,6 +217,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -225,6 +227,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -253,6 +256,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -303,6 +307,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -360,6 +365,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -376,12 +382,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -392,8 +398,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -414,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:
@@ -611,8 +617,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/interfaces/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/interfaces/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,8 +59,11 @@
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kateincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 libkatepartinterfaces_la_DEPENDENCIES =  \
-	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkatepartinterfaces_la_OBJECTS = interfaces.lo katecmd.lo
 #>- libkatepartinterfaces_la_OBJECTS =  \
 #>- 	$(am_libkatepartinterfaces_la_OBJECTS)
@@ -120,6 +123,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -234,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@
@@ -262,6 +266,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -271,6 +276,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -299,6 +305,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -349,6 +356,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -406,6 +414,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -416,7 +425,7 @@
 #>- METASOURCES = document.moc view.moc
 lib_LTLIBRARIES = libkatepartinterfaces.la
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KDECORE)
 libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 kateinclude_HEADERS = document.h view.h
 kateincludedir = $(includedir)/kate
@@ -427,12 +436,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -443,8 +452,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -465,9 +474,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -557,7 +566,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -770,8 +779,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/isearch/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/isearch/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,8 +59,11 @@
 	"$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 ktexteditor_isearch_la_DEPENDENCIES =  \
-	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_ktexteditor_isearch_la_OBJECTS = ISearchPlugin.lo
 #>- ktexteditor_isearch_la_OBJECTS = $(am_ktexteditor_isearch_la_OBJECTS)
 #>+ 1
@@ -115,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -414,7 +423,7 @@
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = ktexteditor_isearch.la
 ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 isearchdatadir = $(kde_datadir)/ktexteditor_isearch
 isearchdata_DATA = ktexteditor_isearchui.rc
@@ -425,12 +434,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -441,8 +450,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -463,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -571,7 +580,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -788,8 +797,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/isearch/ktexteditor_isearch.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/isearch/ktexteditor_isearch.desktop
@@ -151,3 +151,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/wordcompletion/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/wordcompletion/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,8 +60,11 @@
 	"$(DESTDIR)$(kde_servicesdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 ktexteditor_docwordcompletion_la_DEPENDENCIES =  \
-	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_ktexteditor_docwordcompletion_la_OBJECTS = docwordcompletion.lo
 #>- ktexteditor_docwordcompletion_la_OBJECTS =  \
 #>- 	$(am_ktexteditor_docwordcompletion_la_OBJECTS)
@@ -119,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -261,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -418,7 +427,7 @@
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
 ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
 docwordcompletiondata_DATA = docwordcompletionui.rc
@@ -429,12 +438,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +454,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -575,7 +584,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -793,8 +802,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
@@ -137,3 +137,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/autobookmarker/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/autobookmarker/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -118,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -428,12 +434,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +450,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -574,7 +580,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -791,8 +797,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
@@ -133,3 +133,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/insertfile/ktexteditor_insertfile.desktop
@@ -154,3 +154,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/insertfile/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/insertfile/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,8 +60,11 @@
 	"$(DESTDIR)$(kde_servicesdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 ktexteditor_insertfile_la_DEPENDENCIES =  \
-	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_ktexteditor_insertfile_la_OBJECTS = insertfileplugin.lo
 #>- ktexteditor_insertfile_la_OBJECTS =  \
 #>- 	$(am_ktexteditor_insertfile_la_OBJECTS)
@@ -119,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -261,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -418,7 +427,7 @@
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = ktexteditor_insertfile.la
 ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
 ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
 insertfiledata_DATA = ktexteditor_insertfileui.rc
@@ -429,12 +438,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +454,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -575,7 +584,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -792,8 +801,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/kdatatool/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/kdatatool/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,8 +59,11 @@
 	"$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 ktexteditor_kdatatool_la_DEPENDENCIES =  \
-	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+	$(top_builddir)/interfaces/ktexteditor/libktexteditor.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_ktexteditor_kdatatool_la_OBJECTS = kate_kdatatool.lo
 #>- ktexteditor_kdatatool_la_OBJECTS =  \
 #>- 	$(am_ktexteditor_kdatatool_la_OBJECTS)
@@ -118,6 +121,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +264,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +274,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +303,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +354,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +412,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -417,7 +426,7 @@
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = ktexteditor_kdatatool.la
 ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
 ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
 kdatatooldata_DATA = ktexteditor_kdatatoolui.rc
@@ -428,12 +437,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -574,7 +583,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -791,8 +800,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
@@ -167,3 +167,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/data/katepart.desktop
+++ kdelibs-3.5.10.dfsg.1/kate/data/katepart.desktop
@@ -88,3 +88,4 @@
 Type=Service
 InitialPreference=8
 MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kate/data/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kate/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -78,6 +78,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -192,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@
@@ -220,6 +221,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -229,6 +231,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -257,6 +260,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -307,6 +311,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -364,6 +369,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -399,12 +405,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -415,8 +421,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -437,9 +443,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:
@@ -670,7 +676,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=changelog.xml txt2tags.xml ini.xml xmldebug.xml pike.xml rib.xml xslt.xml component-pascal.xml logtalk.xml uscript.xml mediawiki.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml vrml.xml postscript.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml fortran.xml bibtex.xml javascript.xml php.xml tcl.xml ahdl.xml lua.xml r.xml glsl.xml perl.xml apache.xml clipper.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml generate-php.pl kbasic.xml Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml objectivec.xml cue.xml mup.xml scheme.xml katepartui.rc katepartreadonlyui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml actionscript.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml euphoria.xml progress.xml alert.xml sieve.xml asm-avr.xml doxygen.xml idl.xml verilog.xml sgml.xml sml.xml abc.xml velocity.xml ldif.xml diff.xml desktop.xml mab.xml yacas.xml jsp.xml coldfusion.xml cg.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml sql-postgresql.xml vhdl.xml e.xml ruby.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml lilypond.xml xharbour.xml octave.xml cisco.xml Makefile.am rhtml.xml makefile.xml 
+KDE_DIST=changelog.xml txt2tags.xml ini.xml xmldebug.xml pike.xml component-pascal.xml rib.xml xslt.xml logtalk.xml mediawiki.xml uscript.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml postscript.xml vrml.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml bibtex.xml fortran.xml javascript.xml php.xml tcl.xml lua.xml ahdl.xml r.xml perl.xml glsl.xml clipper.xml apache.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml kbasic.xml generate-php.pl Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml objectivec.xml cue.xml mup.xml katepartreadonlyui.rc katepartui.rc scheme.xml c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml actionscript.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml euphoria.xml progress.xml alert.xml sieve.xml asm-avr.xml doxygen.xml idl.xml verilog.xml sml.xml sgml.xml abc.xml velocity.xml ldif.xml diff.xml desktop.xml mab.xml yacas.xml jsp.xml cg.xml coldfusion.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml sql-postgresql.xml vhdl.xml e.xml ruby.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml lilypond.xml xharbour.xml octave.xml cisco.xml Makefile.am rhtml.xml makefile.xml 
 
 #>+ 2
 docs-am:
@@ -680,8 +686,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdewidgets/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdewidgets/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,7 +81,8 @@
 LTLIBRARIES = $(kde_widget_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kdewidgets_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kdewidgets_la_OBJECTS = classpreviews.lo kdewidgets.lo
 #>- kdewidgets_la_OBJECTS = $(am_kdewidgets_la_OBJECTS)
 #>+ 4
@@ -169,6 +170,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -283,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@
@@ -311,6 +313,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -320,6 +323,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -348,6 +352,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -398,6 +403,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -455,6 +461,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -470,7 +477,7 @@
 makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libkdecore.la 
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC)
+kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
 CLEANFILES = kdewidgets.cpp
 #>- all: all-recursive
@@ -479,12 +486,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -495,8 +502,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -517,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
 install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -694,7 +701,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -927,8 +934,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdewidgets/pics/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdewidgets/pics/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -385,12 +391,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -401,8 +407,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -423,9 +429,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:
@@ -601,8 +607,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdewidgets/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdewidgets/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,6 +81,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -195,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@
@@ -223,6 +224,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -232,6 +234,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -260,6 +263,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -310,6 +314,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -367,6 +372,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -380,12 +386,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -396,8 +402,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -418,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:
@@ -587,8 +593,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dnssd/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dnssd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,7 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkdnssd_la_DEPENDENCIES = ../kdecore/libkdecore.la \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkdnssd_la_OBJECTS = remoteservice.lo responder.lo servicebase.lo \
 	publicservice.lo query.lo domainbrowser.lo servicebrowser.lo
 #>- libkdnssd_la_OBJECTS = $(am_libkdnssd_la_OBJECTS)
@@ -121,6 +121,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -235,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@
@@ -263,6 +264,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -272,6 +274,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -300,6 +303,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -350,6 +354,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -407,6 +412,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -416,7 +422,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
@@ -434,7 +440,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) $(LIB_QT)
 libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 #>- all: all-am
 #>+ 1
@@ -442,12 +448,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -458,8 +464,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -480,9 +486,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -577,7 +583,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -858,18 +864,18 @@
 .NOEXPORT:
 
 #>+ 3
-remoteservice.moc: $(srcdir)/remoteservice.h
-	$(MOC) $(srcdir)/remoteservice.h -o remoteservice.moc
+servicebrowser.moc: $(srcdir)/servicebrowser.h
+	$(MOC) $(srcdir)/servicebrowser.h -o servicebrowser.moc
 
 #>+ 2
-mocs: remoteservice.moc
+mocs: servicebrowser.moc
 
 #>+ 3
-servicebrowser.moc: $(srcdir)/servicebrowser.h
-	$(MOC) $(srcdir)/servicebrowser.h -o servicebrowser.moc
+remoteservice.moc: $(srcdir)/remoteservice.h
+	$(MOC) $(srcdir)/remoteservice.h -o remoteservice.moc
 
 #>+ 2
-mocs: servicebrowser.moc
+mocs: remoteservice.moc
 
 #>+ 3
 responder.moc: $(srcdir)/responder.h
@@ -901,7 +907,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  remoteservice.moc servicebrowser.moc responder.moc query.moc publicservice.moc domainbrowser.moc
+	-rm -f  servicebrowser.moc remoteservice.moc responder.moc query.moc publicservice.moc domainbrowser.moc
 
 #>+ 2
 KDE_DIST=configure.in.bot settings.kcfgc kcm_kdnssd.kcfg responder.h configure.in.in Makefile.in Makefile.am 
@@ -919,8 +925,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -953,7 +959,7 @@
 
 
 #>+ 11
-libkdnssd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/remoteservice.cpp $(srcdir)/responder.cpp $(srcdir)/servicebase.cpp $(srcdir)/publicservice.cpp $(srcdir)/query.cpp $(srcdir)/domainbrowser.cpp $(srcdir)/servicebrowser.cpp settings.cpp  responder.moc servicebrowser.moc remoteservice.moc query.moc publicservice.moc domainbrowser.moc
+libkdnssd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/remoteservice.cpp $(srcdir)/responder.cpp $(srcdir)/servicebase.cpp $(srcdir)/publicservice.cpp $(srcdir)/query.cpp $(srcdir)/domainbrowser.cpp $(srcdir)/servicebrowser.cpp settings.cpp  responder.moc remoteservice.moc servicebrowser.moc query.moc publicservice.moc domainbrowser.moc
 	@echo 'creating libkdnssd_la.all_cpp.cpp ...'; \
 	rm -f libkdnssd_la.all_cpp.files libkdnssd_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdnssd_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -101,6 +101,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -215,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@
@@ -243,6 +244,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -252,6 +254,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -280,6 +283,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -330,6 +334,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -387,6 +392,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -401,12 +407,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -417,8 +423,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -439,9 +445,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,7 +531,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -836,8 +842,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/webdav.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/webdav.protocol
@@ -16,3 +16,4 @@
 maxInstances=3
 DocPath=kioslave/webdav.html
 Class=:internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/https.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/https.protocol
@@ -10,3 +10,4 @@
 config=http
 DocPath=kioslave/https.html
 Class=:internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -73,7 +73,9 @@
 am__DEPENDENCIES_1 =
 kio_http_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kio/httpfilter/libhttpfilter.la \
-	$(top_builddir)/kio/misc/kntlm/libkntlm.la
+	$(top_builddir)/kio/misc/kntlm/libkntlm.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 am_kio_http_la_OBJECTS = http.lo
 #>- kio_http_la_OBJECTS = $(am_kio_http_la_OBJECTS)
 #>+ 1
@@ -85,7 +87,9 @@
 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)
+#>- kio_http_cache_cleaner_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+#>- 	$(top_builddir)/dcop/libDCOP.la
 #>+ 1
 kio_http_cache_cleaner_la_DEPENDENCIES = libkdeinit_kio_http_cache_cleaner.la
 #>- am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo
@@ -176,6 +180,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -290,7 +296,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,6 +323,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -327,6 +333,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -355,6 +362,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -405,6 +413,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -462,6 +471,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -479,10 +489,10 @@
 kde_module_LTLIBRARIES = kio_http.la
 kio_http_la_SOURCES = http.cc
 #>- kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
-kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la $(LIB_QT) $(LIB_KDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la
+kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) -lgssapi_krb5
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-#>- kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO)
+#>- kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 #>+ 1
 kio_http_cache_cleaner_la_LIBADD = libkdeinit_kio_http_cache_cleaner.la
 kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
@@ -497,12 +507,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -513,8 +523,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -535,9 +545,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -802,7 +812,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1130,13 +1140,15 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO)
+libkdeinit_kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 
 #>+ 2
 libkdeinit_kio_http_cache_cleaner_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kio_http_cache_cleaner_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 4
+libkdeinit_kio_http_cache_cleaner_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la
 
 #>+ 2
 am_libkdeinit_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo
@@ -1177,8 +1189,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/http_cache_cleaner.desktop
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/http_cache_cleaner.desktop
@@ -166,3 +166,4 @@
 Comment[zh_TW]=從 HTTP 快取中清除舊的項目
 Comment[zu]=Ihlanza izingeniso ezindalam ezisuka kwi-cache ye-HTTP
 X-KDE-StartupNotify=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/http.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/http.protocol
@@ -10,3 +10,4 @@
 maxInstances=3
 DocPath=kioslave/http.html
 Class=:internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/webdavs.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/webdavs.protocol
@@ -16,3 +16,4 @@
 config=webdav
 DocPath=kioslave/webdavs.html
 Class=:internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/kcookiejar/kcookiejar.desktop
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/kcookiejar/kcookiejar.desktop
@@ -155,3 +155,4 @@
 X-KDE-FactoryName=kcookiejar
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/kcookiejar/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/kcookiejar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -69,7 +69,8 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(kdeinit_LTLIBRARIES) \
 	$(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-#>- kcookiejar_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kcookiejar_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+#>- 	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 #>+ 1
 kcookiejar_la_DEPENDENCIES = libkdeinit_kcookiejar.la
 #>- am_kcookiejar_la_OBJECTS = main.lo
@@ -86,7 +87,9 @@
 	$(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__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kded/libkdeinit_kded.la
 am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
 	kcookiewin.lo
 #>- kded_kcookiejar_la_OBJECTS = $(am_kded_kcookiejar_la_OBJECTS)
@@ -174,6 +177,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -288,7 +293,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,6 +320,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -325,6 +330,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -353,6 +359,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -403,6 +410,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -460,6 +468,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -477,7 +486,7 @@
 kcookiejar_la_SOURCES = main.cpp
 #>- METASOURCES = AUTO
 kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#>- kcookiejar_la_LIBADD = $(LIB_KDECORE)
+#>- kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 #>+ 1
 kcookiejar_la_LIBADD = libkdeinit_kcookiejar.la
 #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
@@ -487,7 +496,7 @@
 			 kcookiewin.cpp  kcookieserver_skel.cpp
 
 kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kcookiejar_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
+kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
 kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
 update_DATA = kcookiescfg.upd
@@ -500,12 +509,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -516,8 +525,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -538,9 +547,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -820,7 +829,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1058,13 +1067,14 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_kcookiejar_la_LIBADD = $(LIB_KDECORE)
+libkdeinit_kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 
 #>+ 2
 libkdeinit_kcookiejar_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
-#>+ 2
-libkdeinit_kcookiejar_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>+ 3
+libkdeinit_kcookiejar_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 
 #>+ 2
 am_libkdeinit_kcookiejar_la_OBJECTS = main.lo
@@ -1108,7 +1118,7 @@
 	-rm -f  kcookiewin.moc kcookieserver.moc
 
 #>+ 2
-KDE_DIST=kcookiescfg.upd Makefile.in kcookiejar.h kcookiejar.desktop rfc2965 kcookieserver.h domain_info netscape_cookie_spec.html kcookiewin.h rfc2109 Makefile.am 
+KDE_DIST=kcookiescfg.upd Makefile.in kcookiejar.h kcookiejar.desktop kcookieserver.h domain_info netscape_cookie_spec.html kcookiewin.h Makefile.am 
 
 #>+ 4
 clean-idl:
@@ -1123,8 +1133,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/http/kcookiejar/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/kcookiejar/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -104,6 +104,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -218,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@
@@ -246,6 +247,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -255,6 +257,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -283,6 +286,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -333,6 +337,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -390,6 +395,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -407,12 +413,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -423,8 +429,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -445,9 +451,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:
@@ -500,7 +506,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -699,8 +705,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/ftp/ftp.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/ftp/ftp.protocol
@@ -16,3 +16,4 @@
 maxInstances=2
 DocPath=kioslave/ftp.html
 Class=:internet
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/ftp/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/ftp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kio_ftp_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kio_ftp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kio_ftp_la_OBJECTS = ftp.lo
 #>- kio_ftp_la_OBJECTS = $(am_kio_ftp_la_OBJECTS)
 #>+ 1
@@ -117,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -415,7 +422,7 @@
 ####### Files
 kde_module_LTLIBRARIES = kio_ftp.la
 kio_ftp_la_SOURCES = ftp.cc
-kio_ftp_la_LIBADD = $(LIB_KIO)
+kio_ftp_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 noinst_HEADERS = ftp.h
 kdelnk_DATA = ftp.protocol
@@ -426,12 +433,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -442,8 +449,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -464,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -555,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -754,8 +761,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/file/file.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/file/file.protocol
@@ -13,3 +13,4 @@
 maxInstances=4
 DocPath=kioslave/file.html
 Class=:local
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/file/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/file/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kio_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kio_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kio_file_la_OBJECTS = file.lo
 #>- kio_file_la_OBJECTS = $(am_kio_file_la_OBJECTS)
 #>+ 1
@@ -118,6 +119,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +262,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +272,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +301,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +352,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +410,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -417,7 +424,7 @@
 ####### Files
 kde_module_LTLIBRARIES = kio_file.la
 kio_file_la_SOURCES = file.cc
-kio_file_la_LIBADD = $(LIB_KIO)
+kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(ACL_LIBS)
 kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 noinst_HEADERS = file.h
 fileinclude_HEADERS = file.h
@@ -431,12 +438,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -447,8 +454,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -469,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -577,7 +584,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -791,8 +798,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/bzip2/kbzip2filter.desktop
+++ kdelibs-3.5.10.dfsg.1/kioslave/bzip2/kbzip2filter.desktop
@@ -84,3 +84,4 @@
 Name[zu]=Ihluzo le-BZip2
 X-KDE-Library=kbzip2filter
 ServiceTypes=KDECompressionFilter,application/x-bzip2,application/x-tbz
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/bzip2/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/bzip2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,6 +61,7 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kbzip2filter_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_kbzip2filter_la_OBJECTS = kbzip2filter.lo
 #>- kbzip2filter_la_OBJECTS = $(am_kbzip2filter_la_OBJECTS)
@@ -115,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -412,7 +419,7 @@
 #>- METASOURCES = AUTO
 kde_module_LTLIBRARIES = kbzip2filter.la
 kbzip2filter_la_SOURCES = kbzip2filter.cpp
-kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
+kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
 kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kde_services_DATA = kbzip2filter.desktop
 #>- all: all-am
@@ -421,12 +428,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -437,8 +444,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -459,9 +466,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -550,7 +557,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -753,8 +760,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/gzip/kgzipfilter.desktop
+++ kdelibs-3.5.10.dfsg.1/kioslave/gzip/kgzipfilter.desktop
@@ -84,3 +84,4 @@
 Name[zu]=Ihluzo le-GZip
 X-KDE-Library=kgzipfilter
 ServiceTypes=KDECompressionFilter,application/x-gzip,application/x-tgz
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/gzip/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/gzip/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,6 +61,7 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kgzipfilter_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_kgzipfilter_la_OBJECTS = kgzipfilter.lo
 #>- kgzipfilter_la_OBJECTS = $(am_kgzipfilter_la_OBJECTS)
@@ -115,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,7 +420,7 @@
 #>- METASOURCES = AUTO
 kde_module_LTLIBRARIES = kgzipfilter.la
 kgzipfilter_la_SOURCES = kgzipfilter.cpp
-kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ)
+kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_KDECORE)
 kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kde_services_DATA = kgzipfilter.desktop
 #>- all: all-am
@@ -422,12 +429,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -438,8 +445,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -460,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -551,7 +558,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -754,8 +761,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/metainfo/metainfo.protocol
+++ kdelibs-3.5.10.dfsg.1/kioslave/metainfo/metainfo.protocol
@@ -7,3 +7,4 @@
 writing=true
 source=false
 Icon=help
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kioslave/metainfo/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kioslave/metainfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kio_metainfo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kio_metainfo_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kio_metainfo_la_OBJECTS = metainfo.lo
 #>- kio_metainfo_la_OBJECTS = $(am_kio_metainfo_la_OBJECTS)
 #>+ 1
@@ -117,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -415,7 +422,7 @@
 #>- METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_metainfo.la
 kio_metainfo_la_SOURCES = metainfo.cpp
-kio_metainfo_la_LIBADD = $(LIB_KIO)
+kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = metainfo.h 
 kdelnk_DATA = metainfo.protocol
@@ -426,12 +433,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -442,8 +449,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -464,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -555,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -761,8 +768,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,6 +83,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -197,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@
@@ -225,6 +226,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -234,6 +236,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -262,6 +265,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -312,6 +316,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -369,6 +374,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -384,12 +390,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -400,8 +406,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -422,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:
@@ -508,7 +514,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -817,8 +823,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -75,6 +75,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -189,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@
@@ -217,6 +218,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -226,6 +228,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -254,6 +257,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -304,6 +308,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -361,6 +366,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -375,12 +381,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -391,8 +397,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -413,9 +419,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:
@@ -446,7 +452,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -633,8 +639,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kscript/scriptinterface.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kscript/scriptinterface.desktop
@@ -87,3 +87,4 @@
 [PropertyDef::X-KDE-Script-Runner]
 Type=QString
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kscript/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kscript/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkscript_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkscript_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkscript_la_OBJECTS = scriptmanager.lo
 #>- libkscript_la_OBJECTS = $(am_libkscript_la_OBJECTS)
 #>+ 5
@@ -140,6 +142,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -254,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@
@@ -282,6 +285,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -291,6 +295,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -319,6 +324,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -369,6 +375,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -426,6 +433,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -443,7 +451,7 @@
 #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
 libkscript_la_SOURCES = scriptmanager.cpp
 libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO)
+libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
 kscriptincludedir = $(includedir)
 #>- METASOURCES = AUTO
@@ -455,12 +463,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -471,8 +479,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,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
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -671,7 +679,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -906,22 +914,22 @@
 mocs: scriptinterface.moc
 
 #>+ 3
-scriptloader.moc: $(srcdir)/scriptloader.h
-	$(MOC) $(srcdir)/scriptloader.h -o scriptloader.moc
+scriptmanager.moc: $(srcdir)/scriptmanager.h
+	$(MOC) $(srcdir)/scriptmanager.h -o scriptmanager.moc
 
 #>+ 2
-mocs: scriptloader.moc
+mocs: scriptmanager.moc
 
 #>+ 3
-scriptmanager.moc: $(srcdir)/scriptmanager.h
-	$(MOC) $(srcdir)/scriptmanager.h -o scriptmanager.moc
+scriptloader.moc: $(srcdir)/scriptloader.h
+	$(MOC) $(srcdir)/scriptloader.h -o scriptloader.moc
 
 #>+ 2
-mocs: scriptmanager.moc
+mocs: scriptloader.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  scriptclientinterface.moc.cpp scriptinterface.moc scriptloader.moc scriptmanager.moc
+	-rm -f  scriptclientinterface.moc.cpp scriptinterface.moc scriptmanager.moc scriptloader.moc
 
 #>+ 2
 KDE_DIST=scriptloader.h Makefile.in scriptinterface.desktop Makefile.am 
@@ -934,8 +942,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kscript/sample/shellscript.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kscript/sample/shellscript.desktop
@@ -151,3 +151,4 @@
 Comment[zh_CN]=在应用程序内运行 bash shell 脚本。
 Comment[zh_HK]=於程式內執行 bash shell script 檔案
 Comment[zh_TW]=於程式內執行 bash shell script 檔案
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kscript/sample/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kscript/sample/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,7 +59,10 @@
 	"$(DESTDIR)$(servicetypedir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-libshellscript_la_DEPENDENCIES = ../libkscript.la
+am__DEPENDENCIES_1 =
+libshellscript_la_DEPENDENCIES = ../libkscript.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la
 am_libshellscript_la_OBJECTS = shellscript.lo
 #>- libshellscript_la_OBJECTS = $(am_libshellscript_la_OBJECTS)
 #>+ 1
@@ -113,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -227,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@
@@ -255,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -264,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -292,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -342,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -399,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -410,7 +419,7 @@
 kde_module_LTLIBRARIES = libshellscript.la
 libshellscript_la_SOURCES = shellscript.cpp
 libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la
+libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 #>- METASOURCES = AUTO
 servicetypedir = $(kde_servicesdir)
 servicetype_DATA = shellscript.desktop
@@ -420,12 +429,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -436,8 +445,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -458,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -549,7 +558,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -761,8 +770,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kspeech/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kspeech/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -79,6 +79,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -193,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@
@@ -221,6 +222,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -230,6 +232,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -258,6 +261,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -308,6 +312,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -365,6 +370,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -385,12 +391,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -401,8 +407,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -423,9 +429,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:
@@ -473,7 +479,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -756,8 +762,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kspeech/dcoptexttospeech.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kspeech/dcoptexttospeech.desktop
@@ -68,3 +68,4 @@
 Comment[zh_CN]=带 DCOP 接口的文本到语音服务
 Comment[zh_HK]=附有 DCOP 介面的文字朗讀工具
 Comment[zh_TW]=DCOP 介面的文字轉語音服務
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kregexpeditor/kregexpeditor.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kregexpeditor/kregexpeditor.desktop
@@ -2,3 +2,4 @@
 Type=ServiceType
 X-KDE-ServiceType=KRegExpEditor/KRegExpEditor
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kregexpeditor/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kregexpeditor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,6 +81,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -195,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@
@@ -223,6 +224,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -232,6 +234,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -260,6 +263,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -310,6 +314,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -367,6 +372,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -384,12 +390,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -400,8 +406,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -422,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:
@@ -472,7 +478,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -661,8 +667,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/ktexteditor/ktexteditorplugin.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/ktexteditor/ktexteditorplugin.desktop
@@ -85,3 +85,4 @@
 Comment[zh_HK]=KTextEditor 外掛程式
 Comment[zh_TW]=KTextEditor 外掛程式
 Comment[zu]= Ukungena ngaphakathi kwe-KTextEditor
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/ktexteditor/ktexteditor.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/ktexteditor/ktexteditor.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=可嵌入的文字編輯器元件 (Doc/View 分開)
 Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 分開)
 Comment[zu]=IIunga Lomlungisi Wombhalo (Ngokuhlukana kwe-Doc/Umbukiso)
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/ktexteditor/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/ktexteditor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -66,8 +66,9 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libktexteditor_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/dcop/libDCOP.la \
-	$(top_builddir)/kabc/libkabc.la
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libktexteditor_la_OBJECTS = ktexteditor.lo editinterface.lo \
 	clipboardinterface.lo selectioninterface.lo searchinterface.lo \
 	codecompletioninterface.lo wordwrapinterface.lo \
@@ -161,6 +162,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -275,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@
@@ -303,6 +305,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -312,6 +315,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -340,6 +344,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -390,6 +395,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -447,6 +453,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -495,7 +502,7 @@
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp
 
 libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kabc/libkabc.la
+libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
 ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
                              clipboardinterface.h popupmenuinterface.h \
@@ -519,12 +526,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -535,8 +542,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -557,9 +564,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -721,7 +728,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1084,22 +1091,22 @@
 mocs: view.moc
 
 #>+ 3
-editorchooser.moc: $(srcdir)/editorchooser.h
-	$(MOC) $(srcdir)/editorchooser.h -o editorchooser.moc
+document.moc: $(srcdir)/document.h
+	$(MOC) $(srcdir)/document.h -o document.moc
 
 #>+ 2
-mocs: editorchooser.moc
+mocs: document.moc
 
 #>+ 3
-document.moc: $(srcdir)/document.h
-	$(MOC) $(srcdir)/document.h -o document.moc
+editorchooser.moc: $(srcdir)/editorchooser.h
+	$(MOC) $(srcdir)/editorchooser.h -o editorchooser.moc
 
 #>+ 2
-mocs: document.moc
+mocs: editorchooser.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  configinterfaceextension.moc plugin.moc editor.moc view.moc editorchooser.moc document.moc
+	-rm -f  configinterfaceextension.moc plugin.moc editor.moc view.moc document.moc editorchooser.moc
 
 #>+ 2
 KDE_DIST=ktexteditorplugin.desktop undodcopinterface.h viewstatusmsgdcopinterface.h ktexteditoreditor.desktop viewcursordcopinterface.h searchdcopinterface.h documentdcopinfo.h kcm_ktexteditor.desktop ktexteditor.desktop editorchooser_ui.ui editdcopinterface.h clipboarddcopinterface.h Makefile.in blockselectiondcopinterface.h encodingdcopinterface.h printdcopinterface.h selectiondcopinterface.h Makefile.am 
@@ -1133,8 +1140,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1167,7 +1174,7 @@
 
 
 #>+ 11
-libktexteditor_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ktexteditor.cpp $(srcdir)/editinterface.cpp $(srcdir)/clipboardinterface.cpp $(srcdir)/selectioninterface.cpp $(srcdir)/searchinterface.cpp $(srcdir)/codecompletioninterface.cpp $(srcdir)/wordwrapinterface.cpp $(srcdir)/blockselectioninterface.cpp $(srcdir)/configinterface.cpp $(srcdir)/cursorinterface.cpp $(srcdir)/dynwordwrapinterface.cpp $(srcdir)/printinterface.cpp $(srcdir)/highlightinginterface.cpp $(srcdir)/markinterface.cpp $(srcdir)/popupmenuinterface.cpp $(srcdir)/undointerface.cpp $(srcdir)/viewcursorinterface.cpp $(srcdir)/editdcopinterface.cpp $(srcdir)/clipboarddcopinterface.cpp $(srcdir)/selectiondcopinterface.cpp $(srcdir)/searchdcopinterface.cpp $(srcdir)/markinterfaceextension.cpp $(srcdir)/configinterfaceextension.cpp $(srcdir)/encodinginterface.cpp $(srcdir)/sessionconfiginterface.cpp $(srcdir)/viewstatusmsginterface.cpp $(srcdir)/editorchooser.cpp $(srcdir)/blockselectiondcopinterface.cpp $(srcdir)/documentinfo.cpp $(srcdir)/documentdcopinfo.cpp $(srcdir)/encodingdcopinterface.cpp $(srcdir)/printdcopinterface.cpp $(srcdir)/undodcopinterface.cpp $(srcdir)/viewcursordcopinterface.cpp $(srcdir)/viewstatusmsgdcopinterface.cpp $(srcdir)/selectioninterfaceext.cpp $(srcdir)/texthintinterface.cpp $(srcdir)/editinterfaceext.cpp $(srcdir)/variableinterface.cpp $(srcdir)/templateinterface.cpp  $(top_builddir)/kabc/addressee.h editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp  plugin.moc configinterfaceextension.moc editor.moc view.moc document.moc editorchooser.moc editorchooser_ui.moc
+libktexteditor_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ktexteditor.cpp $(srcdir)/editinterface.cpp $(srcdir)/clipboardinterface.cpp $(srcdir)/selectioninterface.cpp $(srcdir)/searchinterface.cpp $(srcdir)/codecompletioninterface.cpp $(srcdir)/wordwrapinterface.cpp $(srcdir)/blockselectioninterface.cpp $(srcdir)/configinterface.cpp $(srcdir)/cursorinterface.cpp $(srcdir)/dynwordwrapinterface.cpp $(srcdir)/printinterface.cpp $(srcdir)/highlightinginterface.cpp $(srcdir)/markinterface.cpp $(srcdir)/popupmenuinterface.cpp $(srcdir)/undointerface.cpp $(srcdir)/viewcursorinterface.cpp $(srcdir)/editdcopinterface.cpp $(srcdir)/clipboarddcopinterface.cpp $(srcdir)/selectiondcopinterface.cpp $(srcdir)/searchdcopinterface.cpp $(srcdir)/markinterfaceextension.cpp $(srcdir)/configinterfaceextension.cpp $(srcdir)/encodinginterface.cpp $(srcdir)/sessionconfiginterface.cpp $(srcdir)/viewstatusmsginterface.cpp $(srcdir)/editorchooser.cpp $(srcdir)/blockselectiondcopinterface.cpp $(srcdir)/documentinfo.cpp $(srcdir)/documentdcopinfo.cpp $(srcdir)/encodingdcopinterface.cpp $(srcdir)/printdcopinterface.cpp $(srcdir)/undodcopinterface.cpp $(srcdir)/viewcursordcopinterface.cpp $(srcdir)/viewstatusmsgdcopinterface.cpp $(srcdir)/selectioninterfaceext.cpp $(srcdir)/texthintinterface.cpp $(srcdir)/editinterfaceext.cpp $(srcdir)/variableinterface.cpp $(srcdir)/templateinterface.cpp  $(top_builddir)/kabc/addressee.h editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp  plugin.moc configinterfaceextension.moc editor.moc view.moc editorchooser.moc document.moc editorchooser_ui.moc
 	@echo 'creating libktexteditor_la.all_cpp.cpp ...'; \
 	rm -f libktexteditor_la.all_cpp.files libktexteditor_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/ktexteditor/ktexteditoreditor.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/ktexteditor/ktexteditoreditor.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=可嵌入的文字編輯器元件 (Doc/View 不分開)
 Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 不分開)
 Comment[zu]=Ilunga Lomlungisi Wombhalo (ngaphandle Kokuhlukana kwe-Doc/Umbukiso)
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/ktexteditor/kcm_ktexteditor.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/ktexteditor/kcm_ktexteditor.desktop
@@ -170,3 +170,4 @@
 valueSection=KTextEditor
 valueName=embeddedEditor
 configurationType=component
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/khexedit/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/khexedit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -79,6 +79,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -193,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@
@@ -221,6 +222,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -230,6 +232,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -258,6 +261,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -308,6 +312,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -365,6 +370,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -389,12 +395,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -405,8 +411,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -427,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:
@@ -477,7 +483,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -668,8 +674,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/khexedit/kbytesedit.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/khexedit/kbytesedit.desktop
@@ -2,3 +2,4 @@
 Type=ServiceType
 X-KDE-ServiceType=KHexEdit/KBytesEdit
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kmediaplayer/kmediaplayerengine.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kmediaplayer/kmediaplayerengine.desktop
@@ -1,3 +1,4 @@
 [Desktop Entry]
 Type=ServiceType
 X-KDE-ServiceType=KMediaPlayer/Engine
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kmediaplayer/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kmediaplayer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -63,7 +63,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkmediaplayer_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkmediaplayer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkmediaplayer_la_OBJECTS = player.lo view.lo
 #>- libkmediaplayer_la_OBJECTS = $(am_libkmediaplayer_la_OBJECTS)
 #>+ 4
@@ -140,6 +142,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -254,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@
@@ -282,6 +285,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -291,6 +295,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -319,6 +324,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -369,6 +375,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -426,6 +433,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -441,7 +449,7 @@
 #>+ 1
 libkmediaplayer_la_SOURCES=player.cpp  view.cpp playerdcopobject_skel.cpp
 libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
+libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
 #>- libkmediaplayer_la_METASOURCES = AUTO
 kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
 kmediaplayerincludedir = $(includedir)/kmediaplayer
@@ -452,12 +460,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -468,8 +476,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -490,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
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -669,7 +677,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -931,8 +939,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kmediaplayer/kmediaplayer.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kmediaplayer/kmediaplayer.desktop
@@ -2,3 +2,4 @@
 Type=ServiceType
 X-KDE-ServiceType=KMediaPlayer/Player
 X-KDE-Derived=KParts/ReadOnlyPart
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,8 @@
 am__DEPENDENCIES_1 =
 kfileaudiopreview_la_DEPENDENCIES =  \
 	$(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la \
-	$(top_builddir)/arts/kde/libartskde.la $(am__DEPENDENCIES_1)
+	$(top_builddir)/arts/kde/libartskde.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kfileaudiopreview_la_OBJECTS = kfileaudiopreview.lo
 #>- kfileaudiopreview_la_OBJECTS = $(am_kfileaudiopreview_la_OBJECTS)
 #>+ 1
@@ -115,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,7 +420,7 @@
 kde_module_LTLIBRARIES = kfileaudiopreview.la
 kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
 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)
+kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 noinst_HEADERS = kfileaudiopreview.h
 #>- all: all-am
 #>+ 1
@@ -421,12 +428,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -437,8 +444,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -459,9 +466,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -533,7 +540,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -745,8 +752,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/terminal/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/terminal/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -75,6 +75,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -189,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@
@@ -217,6 +218,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -226,6 +228,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -254,6 +257,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -304,6 +308,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -361,6 +366,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -375,12 +381,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -391,8 +397,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -413,9 +419,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:
@@ -446,7 +452,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -634,8 +640,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/terminal/test/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/terminal/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -102,6 +102,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -216,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@
@@ -244,6 +245,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -253,6 +255,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -281,6 +284,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -331,6 +335,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -388,6 +393,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -406,12 +412,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -422,8 +428,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -444,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-checkPROGRAMS:
@@ -499,7 +505,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -702,8 +708,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/library/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/library/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkimproxy_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkimproxy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 am_libkimproxy_la_OBJECTS = kimproxy.lo
 #>- libkimproxy_la_OBJECTS = $(am_libkimproxy_la_OBJECTS)
 #>+ 4
@@ -137,6 +139,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -251,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@
@@ -279,6 +282,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -288,6 +292,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -316,6 +321,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -366,6 +372,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -423,6 +430,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -439,7 +447,7 @@
 kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
 lib_LTLIBRARIES = libkimproxy.la
 libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO)
+libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI)
 #>- libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
 #>+ 1
 libkimproxy_la_SOURCES=kimproxy.cpp   kimiface_stub.cpp kimproxyiface_skel.cpp
@@ -451,12 +459,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -467,8 +475,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -489,9 +497,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -650,7 +658,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1003,8 +1011,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/library/icons/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/library/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -361,12 +367,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -377,8 +383,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -399,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:
@@ -550,48 +556,48 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr16-action-presence_unknown.png cr32-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr48-action-presence_away.png cr32-action-presence_offline.png 
+KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr32-action-presence_unknown.png cr16-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr32-action-presence_offline.png cr48-action-presence_away.png 
 
 #>+ 2
 docs-am:
 
 #>+ 29
 install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
 
 #>+ 15
 force-reedit:
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/interface/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/interface/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,6 +81,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -195,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@
@@ -223,6 +224,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -232,6 +234,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -260,6 +263,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -310,6 +314,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -367,6 +372,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -387,12 +393,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -403,8 +409,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -425,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:
@@ -492,7 +498,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -778,8 +784,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
@@ -70,3 +70,4 @@
 Comment[zh_CN]=带 DCOP 接口的即时通讯程序
 Comment[zh_HK]=附有 DCOP 介面的即時通訊軟件
 Comment[zh_TW]=DCOP 介面的即時通訊系統
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+++ kdelibs-3.5.10.dfsg.1/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
@@ -136,3 +136,4 @@
 valueSection=InstantMessenger
 valueName=imClient
 configurationType=component
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -725,8 +731,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/kthemestyle/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/kthemestyle/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -78,8 +78,9 @@
 am__installdirs = "$(DESTDIR)$(kde_styledir)"
 kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_style_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 kthemestyle_la_DEPENDENCIES = ../../kdefx/libkdefx.la \
-	../../kdecore/libkdecore.la
+	../../kdecore/libkdecore.la $(am__DEPENDENCIES_1)
 am_kthemestyle_la_OBJECTS = kthemebase.lo kthemestyle.lo kstyledirs.lo
 #>- kthemestyle_la_OBJECTS = $(am_kthemestyle_la_OBJECTS)
 #>+ 4
@@ -135,6 +136,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -249,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@
@@ -277,6 +279,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -286,6 +289,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -314,6 +318,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -364,6 +369,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -421,6 +427,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -433,7 +440,7 @@
 noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
 kde_style_LTLIBRARIES = kthemestyle.la
 kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la  ../../kdecore/libkdecore.la
+kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la  ../../kdecore/libkdecore.la -ldl $(LIB_QT)
 kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
 #>- kthemestyle_la_METASOURCES = AUTO
 #>- all: all-am
@@ -442,12 +449,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -458,8 +465,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -480,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
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -556,7 +563,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -768,8 +775,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/web/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/web/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -120,6 +120,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -234,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@
@@ -262,6 +263,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -271,6 +273,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -299,6 +302,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -349,6 +353,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -406,6 +411,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -428,12 +434,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -444,8 +450,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -558,7 +564,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -753,8 +759,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/web/web.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/web/web.themerc
@@ -161,3 +161,4 @@
 Comment[zu]=Uhlobo lwe-widget ye-web
 [KDE]
 widgetStyle=webstyle.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/highcontrast/highcontrast.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/highcontrast/highcontrast.themerc
@@ -125,3 +125,4 @@
 Comment[zh_TW]=在高彩度下可以使用的風格
 [KDE]
 WidgetStyle=HighContrast
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/highcontrast/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/highcontrast/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -79,7 +79,9 @@
 	"$(DESTDIR)$(stylercdir)"
 kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_style_LTLIBRARIES)
-highcontrast_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+am__DEPENDENCIES_1 =
+highcontrast_la_DEPENDENCIES = ../../kdefx/libkdefx.la \
+	$(am__DEPENDENCIES_1)
 am_highcontrast_la_OBJECTS = highcontrast.lo
 #>- highcontrast_la_OBJECTS = $(am_highcontrast_la_OBJECTS)
 #>+ 1
@@ -152,6 +154,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -266,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@
@@ -294,6 +297,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -303,6 +307,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -331,6 +336,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -381,6 +387,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -438,6 +445,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -456,7 +464,7 @@
 kde_style_LTLIBRARIES = highcontrast.la
 highcontrast_la_SOURCES = highcontrast.cpp
 highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcontrast_la_LIBADD = ../../kdefx/libkdefx.la
+highcontrast_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
 #>- highcontrast_la_METASOURCES = AUTO
 DISTCLEANFILES = $(highcontrast_la_METASOURCES)
 #>- all: all-recursive
@@ -465,12 +473,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -481,8 +489,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -503,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
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -664,7 +672,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -905,8 +913,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/highcontrast/config/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/highcontrast/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kstyle_highcontrast_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kstyle_highcontrast_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kstyle_highcontrast_config_la_OBJECTS = highcontrastconfig.lo
 #>- kstyle_highcontrast_config_la_OBJECTS =  \
 #>- 	$(am_kstyle_highcontrast_config_la_OBJECTS)
@@ -116,6 +117,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -230,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@
@@ -258,6 +260,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -267,6 +270,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -295,6 +299,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -345,6 +350,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -402,6 +408,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,7 +420,7 @@
 noinst_HEADERS = highcontrastconfig.h
 kde_module_LTLIBRARIES = kstyle_highcontrast_config.la
 kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_highcontrast_config_la_LIBADD = $(LIB_KDEUI)
+kstyle_highcontrast_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
 #>- kstyle_highcontrast_config_la_METASOURCES = AUTO
 #>- all: all-am
@@ -422,12 +429,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -438,8 +445,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -460,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -534,7 +541,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -746,8 +753,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/keramik/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/keramik/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,7 +61,9 @@
 am__installdirs = "$(DESTDIR)$(kde_styledir)"
 kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_style_LTLIBRARIES)
-keramik_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+am__DEPENDENCIES_1 =
+keramik_la_DEPENDENCIES = ../../kdefx/libkdefx.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_keramik_la_OBJECTS = keramik.lo pixmaploader.lo gradients.lo \
 	colorutil.lo
 #>- keramik_la_OBJECTS = $(am_keramik_la_OBJECTS)
@@ -132,6 +134,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -246,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@
@@ -274,6 +277,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -283,6 +287,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -311,6 +316,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -361,6 +367,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -418,6 +425,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -432,7 +440,7 @@
 noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
 kde_style_LTLIBRARIES = keramik.la
 keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-keramik_la_LIBADD = ../../kdefx/libkdefx.la
+keramik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) $(LIB_XEXT)
 keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp
 keramik_la_COMPILE_FIRST = keramikrc.h
 #>- keramik_la_METASOURCES = AUTO
@@ -445,12 +453,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -461,8 +469,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -483,9 +491,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -571,7 +579,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -847,8 +855,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/klegacy/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/klegacy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -116,6 +116,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -230,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@
@@ -258,6 +259,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -267,6 +269,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -295,6 +298,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -345,6 +349,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -402,6 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -422,12 +428,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -438,8 +444,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -460,9 +466,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -535,7 +541,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -740,8 +746,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/highcolor/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/highcolor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -78,7 +78,9 @@
 am__installdirs = "$(DESTDIR)$(kde_styledir)"
 kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_style_LTLIBRARIES)
-highcolor_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+am__DEPENDENCIES_1 =
+highcolor_la_DEPENDENCIES = ../../kdefx/libkdefx.la \
+	$(am__DEPENDENCIES_1)
 am_highcolor_la_OBJECTS = highcolor.lo
 #>- highcolor_la_OBJECTS = $(am_highcolor_la_OBJECTS)
 #>+ 1
@@ -131,6 +133,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -245,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@
@@ -273,6 +276,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -282,6 +286,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -310,6 +315,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -360,6 +366,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -417,6 +424,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -429,7 +437,7 @@
 noinst_HEADERS = highcolor.h bitmaps.h
 kde_style_LTLIBRARIES = highcolor.la
 highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcolor_la_LIBADD = ../../kdefx/libkdefx.la
+highcolor_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
 highcolor_la_SOURCES = highcolor.cpp
 #>- highcolor_la_METASOURCES = AUTO
 #>- all: all-am
@@ -438,12 +446,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -454,8 +462,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -476,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
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -550,7 +558,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -755,8 +763,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/kstep.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/kstep.themerc
@@ -106,3 +106,4 @@
 Comment[zu]=Okulandelayo Okungenangqikithi-okunjengesitayela
 [KDE]
 widgetStyle=kstepstyle.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/light-v2.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v2.themerc
@@ -158,3 +158,4 @@
 Comment[zu]=Ukubuyekezwa kwesibili kwesitayela se-widget 'Esilula' kanye nesiphucuzekile.
 [KDE]
 WidgetStyle=Light, 2nd revision
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/default.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/default.themerc
@@ -150,3 +150,4 @@
 InactiveShading=true
 [KDE]
 WidgetStyle=Default
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/highcolor.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/highcolor.themerc
@@ -148,3 +148,4 @@
 Comment[zh_TW]=預設風格的高彩版本
 [KDE]
 WidgetStyle=HighColor
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/keramik.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/keramik.themerc
@@ -97,3 +97,4 @@
 
 [KDE]
 WidgetStyle=Keramik
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/b3.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/b3.themerc
@@ -88,3 +88,4 @@
 Comment[zu]=B3/Ukulungisa kwe-B2
 [KDE]
 WidgetStyle=B3
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/mega.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/mega.themerc
@@ -74,3 +74,4 @@
 Name[zu]=Isitayela sombala ophezulu se-MegaGradient
 [KDE]
 widgetStyle=mega.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/beos.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/beos.themerc
@@ -81,3 +81,4 @@
 Comment[zh_TW]=沒有主題的 BeOS 的風格
 [KDE]
 widgetStyle=beosstyle.la
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/qtwindows.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/qtwindows.themerc
@@ -94,3 +94,4 @@
 Comment[zu]=Yakhelwe-kuhlobo kwisitayela samawindi 9x
 [KDE]
 WidgetStyle=Windows
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -74,6 +74,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -188,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@
@@ -216,6 +217,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -225,6 +227,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -253,6 +256,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -303,6 +307,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -360,6 +365,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -615,8 +621,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/qtplatinum.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/qtplatinum.themerc
@@ -107,3 +107,4 @@
 Comment[zu]=Yakhelwe-kuhlobo lwesingenabizogama isitayelaPlatinum 
 [KDE]
 WidgetStyle=Platinum
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/qtmotif.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/qtmotif.themerc
@@ -92,3 +92,4 @@
 Comment[zu]=Ukwakekha-ngaphakathi okungenagqikithi sesitayela se-Motif
 [KDE]
 WidgetStyle=Motif
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/qtsgi.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/qtsgi.themerc
@@ -88,3 +88,4 @@
 Comment[zu]=Yakhelwe-kwisitayela se SGI
 [KDE]
 WidgetStyle=SGI
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/light-v3.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v3.themerc
@@ -159,3 +159,4 @@
 Comment[zu]=Ukubuyekezwa kwesithathu kwesitayela se-widget 'Esilula' kanye nokuphucuzekile.
 [KDE]
 WidgetStyle=Light, 3rd revision
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/themes/qtcde.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/qtcde.themerc
@@ -86,3 +86,4 @@
 Comment[zu]=Isitayela Sokwakheka-ngaphakathi okungenagqikithi
 [KDE]
 WidgetStyle=CDE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/riscos/riscos.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/riscos/riscos.themerc
@@ -342,3 +342,4 @@
 windowBackground=255,255,255
 selectForeground=255,255,255
 selectBackground=0,0,0
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/riscos/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/riscos/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -73,6 +73,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -187,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@
@@ -215,6 +216,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -224,6 +226,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -252,6 +255,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -302,6 +306,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -359,6 +364,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -409,12 +415,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -425,8 +431,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -447,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
 
 mostlyclean-libtool:
@@ -643,8 +649,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/light/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/light/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -135,6 +135,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -249,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@
@@ -277,6 +278,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -286,6 +288,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -314,6 +317,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -364,6 +368,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -421,6 +426,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -442,12 +448,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -458,8 +464,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -480,9 +486,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -556,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -768,8 +774,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/utils/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/utils/installtheme/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/utils/installtheme/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -57,7 +57,8 @@
 #>+ 1
 kinstalltheme_OBJECTS = main.$(OBJEXT)
 am__DEPENDENCIES_1 =
-kinstalltheme_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kinstalltheme_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 #>- kinstalltheme_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 #>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 #>- 	$(CXXFLAGS) $(kinstalltheme_LDFLAGS) $(LDFLAGS) -o $@
@@ -105,6 +106,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -219,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@
@@ -247,6 +249,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -256,6 +259,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -284,6 +288,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -334,6 +339,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -391,6 +397,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -410,19 +417,19 @@
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
-kinstalltheme_LDADD = $(LIB_KDEUI)
+kinstalltheme_LDADD = $(LIB_QT) $(LIB_KDECORE)
 #>- 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -433,8 +440,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -455,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -531,7 +538,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -723,8 +730,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/plastik/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/plastik/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,7 +61,9 @@
 	"$(DESTDIR)$(stylercdir)"
 kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_style_LTLIBRARIES)
-plastik_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+am__DEPENDENCIES_1 =
+plastik_la_DEPENDENCIES = ../../kdefx/libkdefx.la \
+	$(am__DEPENDENCIES_1)
 am_plastik_la_OBJECTS = plastik.lo misc.lo
 #>- plastik_la_OBJECTS = $(am_plastik_la_OBJECTS)
 #>+ 4
@@ -137,6 +139,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -251,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@
@@ -279,6 +282,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -288,6 +292,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -316,6 +321,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -366,6 +372,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -423,6 +430,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -441,7 +449,7 @@
 kde_style_LTLIBRARIES = plastik.la
 plastik_la_SOURCES = plastik.cpp misc.cpp
 plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-plastik_la_LIBADD = ../../kdefx/libkdefx.la
+plastik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
 #>- plastik_la_METASOURCES = AUTO
 DISTCLEANFILES = $(plastik_la_METASOURCES)
 #>- all: all-recursive
@@ -450,12 +458,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -466,8 +474,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -488,9 +496,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -650,7 +658,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -891,8 +899,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/plastik/plastik.themerc
+++ kdelibs-3.5.10.dfsg.1/kstyles/plastik/plastik.themerc
@@ -99,3 +99,4 @@
 Comment[zh_TW]=簡單而乾淨的風格
 [KDE]
 WidgetStyle=Plastik
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kstyles/plastik/config/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kstyles/plastik/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,8 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kstyle_plastik_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kstyle_plastik_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kstyle_plastik_config_la_OBJECTS = plastikconf.lo
 #>- kstyle_plastik_config_la_OBJECTS =  \
 #>- 	$(am_kstyle_plastik_config_la_OBJECTS)
@@ -116,6 +117,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -230,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@
@@ -258,6 +260,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -267,6 +270,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -295,6 +299,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -345,6 +350,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -402,6 +408,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -413,7 +420,7 @@
 noinst_HEADERS = plastikconf.h
 kde_module_LTLIBRARIES = kstyle_plastik_config.la
 kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_plastik_config_la_LIBADD = $(LIB_KDEUI)
+kstyle_plastik_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
 kstyle_plastik_config_la_SOURCES = plastikconf.cpp
 #>- kstyle_plastik_config_la_METASOURCES = AUTO
 #>- all: all-am
@@ -422,12 +429,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -438,8 +445,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -460,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -534,7 +541,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -746,8 +753,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kutils/kplugininfo.desktop
+++ kdelibs-3.5.10.dfsg.1/kutils/kplugininfo.desktop
@@ -105,3 +105,4 @@
 
 [PropertyDef::X-KDE-PluginInfo-EnabledByDefault]
 Type=bool
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kutils/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,11 @@
 	"$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libkutils_la_DEPENDENCIES = ../kio/libkio.la ksettings/libksettings.la
+am__DEPENDENCIES_1 =
+libkutils_la_DEPENDENCIES = ../kio/libkio.la ksettings/libksettings.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkutils_la_OBJECTS = kfind.lo kfinddialog.lo kreplace.lo \
 	kreplacedialog.lo kcmoduleinfo.lo kcmoduleloader.lo \
 	kcmultidialog.lo kmultitabbar.lo kplugininfo.lo \
@@ -147,6 +151,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -261,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@
@@ -289,6 +294,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -298,6 +304,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -326,6 +333,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -376,6 +384,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -433,6 +442,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -445,7 +455,7 @@
 lib_LTLIBRARIES = libkutils.la
 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_LIBADD = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
 #>- libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
 #>-                        kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \
 #>-                        kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp \
@@ -477,12 +487,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -493,8 +503,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -515,9 +525,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -705,7 +715,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1028,18 +1038,18 @@
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmoduleproxyIface.kidl
 
 #>+ 3
-kcmultidialog.moc: $(srcdir)/kcmultidialog.h
-	$(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
+kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
+	$(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
 
 #>+ 2
-mocs: kcmultidialog.moc
+mocs: kcmoduleproxyIfaceImpl.moc
 
 #>+ 3
-kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
-	$(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
+kcmultidialog.moc: $(srcdir)/kcmultidialog.h
+	$(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
 
 #>+ 2
-mocs: kcmoduleproxyIfaceImpl.moc
+mocs: kcmultidialog.moc
 
 #>+ 3
 kpluginselector.moc: $(srcdir)/kpluginselector.h
@@ -1091,11 +1101,11 @@
 mocs: kmultitabbar_p.moc
 
 #>+ 3
-kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
-	$(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
+kfind.moc: $(srcdir)/kfind.h
+	$(MOC) $(srcdir)/kfind.h -o kfind.moc
 
 #>+ 2
-mocs: kcmoduleproxy.moc
+mocs: kfind.moc
 
 #>+ 3
 kpluginselector_p.moc: $(srcdir)/kpluginselector_p.h
@@ -1105,15 +1115,15 @@
 mocs: kpluginselector_p.moc
 
 #>+ 3
-kfind.moc: $(srcdir)/kfind.h
-	$(MOC) $(srcdir)/kfind.h -o kfind.moc
+kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
+	$(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
 
 #>+ 2
-mocs: kfind.moc
+mocs: kcmoduleproxy.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kcmoduleproxy.moc kpluginselector_p.moc kfind.moc
+	-rm -f  kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kfind.moc kpluginselector_p.moc kcmoduleproxy.moc
 
 #>+ 2
 KDE_DIST=kdeglobals.kcfgc Makefile.in groups.dox kdeglobals.kcfg kplugininfo.desktop Makefile.am 
@@ -1131,8 +1141,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1165,7 +1175,7 @@
 
 
 #>+ 11
-libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp  kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kfind.moc kpluginselector_p.moc kcmoduleproxy.moc
+libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp  kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kcmoduleproxy.moc kpluginselector_p.moc kfind.moc
 	@echo 'creating libkutils_la.all_cpp.cpp ...'; \
 	rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kutils/ksettings/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kutils/ksettings/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -110,6 +110,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -224,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@
@@ -252,6 +253,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -261,6 +263,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -289,6 +292,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -339,6 +343,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -396,6 +401,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -415,12 +421,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -431,8 +437,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -453,9 +459,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:
@@ -529,7 +535,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -755,8 +761,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kutils/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kutils/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -113,6 +113,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -227,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@
@@ -255,6 +256,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -264,6 +266,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -292,6 +295,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -342,6 +346,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -399,6 +404,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -420,12 +426,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -436,8 +442,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -458,9 +464,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:
@@ -517,7 +523,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -560,7 +566,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -571,7 +577,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -583,7 +589,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -597,23 +603,36 @@
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -801,8 +820,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,7 +83,11 @@
 	"$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libkdeui_la_DEPENDENCIES = ../kdecore/libkdecore.la
+am__DEPENDENCIES_1 =
+libkdeui_la_DEPENDENCIES = ../kdecore/libkdecore.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/kdefx/libkdefx.la \
+	$(am__DEPENDENCIES_1)
 am_libkdeui_la_OBJECTS = qxembed.lo ksharedpixmap.lo kpixmapio.lo \
 	kpopupmenu.lo ktoolbar.lo kaction.lo kstdaction.lo \
 	kactioncollection.lo kactionclasses.lo kurllabel.lo \
@@ -168,7 +172,7 @@
 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
+libkspell_la_LIBADD =
 am_libkspell_la_OBJECTS = dummy.lo
 #>- libkspell_la_OBJECTS = $(am_libkspell_la_OBJECTS)
 #>+ 1
@@ -231,7 +235,6 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 1
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -245,6 +248,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -359,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@
@@ -387,6 +391,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -396,6 +401,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -424,6 +430,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -474,6 +481,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -531,6 +539,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -538,7 +547,8 @@
 xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
-SUBDIRS = . kdetrayproxy tests about
+SUBDIRS = . tests about
+DIST_SUBDIRS = kdetrayproxy
 INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes)
 
 # For the future: examine if condensing the tons of *_LDFLAGS variables
@@ -546,9 +556,8 @@
 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
-libkdeui_la_LIBADD = ../kdecore/libkdecore.la
+libkdeui_la_LIBADD = ../kdecore/libkdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libkdefx.la $(LIB_XEXT)
 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
 pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png
@@ -710,12 +719,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -726,8 +735,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -748,9 +757,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -1083,7 +1092,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1456,6 +1465,13 @@
 mocs: kcompletionbox.moc
 
 #>+ 3
+kactionclasses.moc: $(srcdir)/kactionclasses.h
+	$(MOC) $(srcdir)/kactionclasses.h -o kactionclasses.moc
+
+#>+ 2
+mocs: kactionclasses.moc
+
+#>+ 3
 kauthicon.moc: $(srcdir)/kauthicon.h
 	$(MOC) $(srcdir)/kauthicon.h -o kauthicon.moc
 
@@ -1470,13 +1486,6 @@
 mocs: knuminput.moc
 
 #>+ 3
-kactionclasses.moc: $(srcdir)/kactionclasses.h
-	$(MOC) $(srcdir)/kactionclasses.h -o kactionclasses.moc
-
-#>+ 2
-mocs: kactionclasses.moc
-
-#>+ 3
 kshortcutdialog.moc: $(srcdir)/kshortcutdialog.h
 	$(MOC) $(srcdir)/kshortcutdialog.h -o kshortcutdialog.moc
 
@@ -1519,18 +1528,18 @@
 mocs: kbuttonbox.moc
 
 #>+ 3
-klistbox.moc: $(srcdir)/klistbox.h
-	$(MOC) $(srcdir)/klistbox.h -o klistbox.moc
+kcombobox.moc: $(srcdir)/kcombobox.h
+	$(MOC) $(srcdir)/kcombobox.h -o kcombobox.moc
 
 #>+ 2
-mocs: klistbox.moc
+mocs: kcombobox.moc
 
 #>+ 3
-kcombobox.moc: $(srcdir)/kcombobox.h
-	$(MOC) $(srcdir)/kcombobox.h -o kcombobox.moc
+klistbox.moc: $(srcdir)/klistbox.h
+	$(MOC) $(srcdir)/klistbox.h -o klistbox.moc
 
 #>+ 2
-mocs: kcombobox.moc
+mocs: klistbox.moc
 
 #>+ 3
 kscrollview.moc: $(srcdir)/kscrollview.h
@@ -1540,18 +1549,18 @@
 mocs: kscrollview.moc
 
 #>+ 3
-krootpixmap.moc: $(srcdir)/krootpixmap.h
-	$(MOC) $(srcdir)/krootpixmap.h -o krootpixmap.moc
+ktabbar.moc: $(srcdir)/ktabbar.h
+	$(MOC) $(srcdir)/ktabbar.h -o ktabbar.moc
 
 #>+ 2
-mocs: krootpixmap.moc
+mocs: ktabbar.moc
 
 #>+ 3
-ktabbar.moc: $(srcdir)/ktabbar.h
-	$(MOC) $(srcdir)/ktabbar.h -o ktabbar.moc
+krootpixmap.moc: $(srcdir)/krootpixmap.h
+	$(MOC) $(srcdir)/krootpixmap.h -o krootpixmap.moc
 
 #>+ 2
-mocs: ktabbar.moc
+mocs: krootpixmap.moc
 
 #>+ 3
 ksystemtray.moc: $(srcdir)/ksystemtray.h
@@ -1589,18 +1598,18 @@
 mocs: kwizard.moc
 
 #>+ 3
-kpopupmenu.moc: $(srcdir)/kpopupmenu.h
-	$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
+kkeybutton.moc: $(srcdir)/kkeybutton.h
+	$(MOC) $(srcdir)/kkeybutton.h -o kkeybutton.moc
 
 #>+ 2
-mocs: kpopupmenu.moc
+mocs: kkeybutton.moc
 
 #>+ 3
-kkeybutton.moc: $(srcdir)/kkeybutton.h
-	$(MOC) $(srcdir)/kkeybutton.h -o kkeybutton.moc
+kpopupmenu.moc: $(srcdir)/kpopupmenu.h
+	$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
 
 #>+ 2
-mocs: kkeybutton.moc
+mocs: kpopupmenu.moc
 
 #>+ 3
 kprogress.moc: $(srcdir)/kprogress.h
@@ -1631,18 +1640,18 @@
 mocs: kpixmapregionselectorwidget.moc
 
 #>+ 3
-ktabwidget.moc: $(srcdir)/ktabwidget.h
-	$(MOC) $(srcdir)/ktabwidget.h -o ktabwidget.moc
+kdialog.moc: $(srcdir)/kdialog.h
+	$(MOC) $(srcdir)/kdialog.h -o kdialog.moc
 
 #>+ 2
-mocs: ktabwidget.moc
+mocs: kdialog.moc
 
 #>+ 3
-kdialog.moc: $(srcdir)/kdialog.h
-	$(MOC) $(srcdir)/kdialog.h -o kdialog.moc
+ktabwidget.moc: $(srcdir)/ktabwidget.h
+	$(MOC) $(srcdir)/ktabwidget.h -o ktabwidget.moc
 
 #>+ 2
-mocs: kdialog.moc
+mocs: ktabwidget.moc
 
 #>+ 3
 kactioncollection.moc: $(srcdir)/kactioncollection.h
@@ -1666,11 +1675,11 @@
 mocs: kaction.moc
 
 #>+ 3
-kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
-	$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
+ktextbrowser.moc: $(srcdir)/ktextbrowser.h
+	$(MOC) $(srcdir)/ktextbrowser.h -o ktextbrowser.moc
 
 #>+ 2
-mocs: kiconviewsearchline.moc
+mocs: ktextbrowser.moc
 
 #>+ 3
 kspell.moc: $(srcdir)/kspell.h
@@ -1680,25 +1689,25 @@
 mocs: kspell.moc
 
 #>+ 3
-ktextbrowser.moc: $(srcdir)/ktextbrowser.h
-	$(MOC) $(srcdir)/ktextbrowser.h -o ktextbrowser.moc
+kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
+	$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
 
 #>+ 2
-mocs: ktextbrowser.moc
+mocs: kiconviewsearchline.moc
 
 #>+ 3
-khelpmenu.moc: $(srcdir)/khelpmenu.h
-	$(MOC) $(srcdir)/khelpmenu.h -o khelpmenu.moc
+kdatepicker.moc: $(srcdir)/kdatepicker.h
+	$(MOC) $(srcdir)/kdatepicker.h -o kdatepicker.moc
 
 #>+ 2
-mocs: khelpmenu.moc
+mocs: kdatepicker.moc
 
 #>+ 3
-kdatepicker.moc: $(srcdir)/kdatepicker.h
-	$(MOC) $(srcdir)/kdatepicker.h -o kdatepicker.moc
+khelpmenu.moc: $(srcdir)/khelpmenu.h
+	$(MOC) $(srcdir)/khelpmenu.h -o khelpmenu.moc
 
 #>+ 2
-mocs: kdatepicker.moc
+mocs: khelpmenu.moc
 
 #>+ 3
 ktoolbarradiogroup.moc: $(srcdir)/ktoolbarradiogroup.h
@@ -1715,11 +1724,11 @@
 mocs: kdatewidget.moc
 
 #>+ 3
-kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
-	$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
+kanimwidget.moc: $(srcdir)/kanimwidget.h
+	$(MOC) $(srcdir)/kanimwidget.h -o kanimwidget.moc
 
 #>+ 2
-mocs: kaboutdialog_private.moc
+mocs: kanimwidget.moc
 
 #>+ 3
 ktoolbar.moc: $(srcdir)/ktoolbar.h
@@ -1729,11 +1738,11 @@
 mocs: ktoolbar.moc
 
 #>+ 3
-kanimwidget.moc: $(srcdir)/kanimwidget.h
-	$(MOC) $(srcdir)/kanimwidget.h -o kanimwidget.moc
+kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
+	$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
 
 #>+ 2
-mocs: kanimwidget.moc
+mocs: kaboutdialog_private.moc
 
 #>+ 3
 kcmodule.moc: $(srcdir)/kcmodule.h
@@ -1785,18 +1794,18 @@
 mocs: kstatusbar.moc
 
 #>+ 3
-kdockwindow.moc: $(srcdir)/kdockwindow.h
-	$(MOC) $(srcdir)/kdockwindow.h -o kdockwindow.moc
+kpanelmenu.moc: $(srcdir)/kpanelmenu.h
+	$(MOC) $(srcdir)/kpanelmenu.h -o kpanelmenu.moc
 
 #>+ 2
-mocs: kdockwindow.moc
+mocs: kpanelmenu.moc
 
 #>+ 3
-kpanelmenu.moc: $(srcdir)/kpanelmenu.h
-	$(MOC) $(srcdir)/kpanelmenu.h -o kpanelmenu.moc
+kdockwindow.moc: $(srcdir)/kdockwindow.h
+	$(MOC) $(srcdir)/kdockwindow.h -o kdockwindow.moc
 
 #>+ 2
-mocs: kpanelmenu.moc
+mocs: kdockwindow.moc
 
 #>+ 3
 kcmenumngr.moc: $(srcdir)/kcmenumngr.h
@@ -2023,18 +2032,18 @@
 mocs: kjanuswidget.moc
 
 #>+ 3
-ktextedit.moc: $(srcdir)/ktextedit.h
-	$(MOC) $(srcdir)/ktextedit.h -o ktextedit.moc
+kpanelapplet.moc: $(srcdir)/kpanelapplet.h
+	$(MOC) $(srcdir)/kpanelapplet.h -o kpanelapplet.moc
 
 #>+ 2
-mocs: ktextedit.moc
+mocs: kpanelapplet.moc
 
 #>+ 3
-kpanelapplet.moc: $(srcdir)/kpanelapplet.h
-	$(MOC) $(srcdir)/kpanelapplet.h -o kpanelapplet.moc
+ktextedit.moc: $(srcdir)/ktextedit.h
+	$(MOC) $(srcdir)/ktextedit.h -o ktextedit.moc
 
 #>+ 2
-mocs: kpanelapplet.moc
+mocs: ktextedit.moc
 
 #>+ 3
 kseparator.moc: $(srcdir)/kseparator.h
@@ -2051,18 +2060,18 @@
 mocs: ksconfig.moc
 
 #>+ 3
-kpanelappmenu.moc: $(srcdir)/kpanelappmenu.h
-	$(MOC) $(srcdir)/kpanelappmenu.h -o kpanelappmenu.moc
+kcursor_private.moc: $(srcdir)/kcursor_private.h
+	$(MOC) $(srcdir)/kcursor_private.h -o kcursor_private.moc
 
 #>+ 2
-mocs: kpanelappmenu.moc
+mocs: kcursor_private.moc
 
 #>+ 3
-kcursor_private.moc: $(srcdir)/kcursor_private.h
-	$(MOC) $(srcdir)/kcursor_private.h -o kcursor_private.moc
+kpanelappmenu.moc: $(srcdir)/kpanelappmenu.h
+	$(MOC) $(srcdir)/kpanelappmenu.h -o kpanelappmenu.moc
 
 #>+ 2
-mocs: kcursor_private.moc
+mocs: kpanelappmenu.moc
 
 #>+ 3
 kselect.moc: $(srcdir)/kselect.h
@@ -2079,13 +2088,6 @@
 mocs: kwindowlistmenu.moc
 
 #>+ 3
-kdockwidget_private.moc: $(srcdir)/kdockwidget_private.h
-	$(MOC) $(srcdir)/kdockwidget_private.h -o kdockwidget_private.moc
-
-#>+ 2
-mocs: kdockwidget_private.moc
-
-#>+ 3
 keditcl.moc: $(srcdir)/keditcl.h
 	$(MOC) $(srcdir)/keditcl.h -o keditcl.moc
 
@@ -2100,6 +2102,13 @@
 mocs: kfontcombo.moc
 
 #>+ 3
+kdockwidget_private.moc: $(srcdir)/kdockwidget_private.h
+	$(MOC) $(srcdir)/kdockwidget_private.h -o kdockwidget_private.moc
+
+#>+ 2
+mocs: kdockwidget_private.moc
+
+#>+ 3
 kcolordialog.moc: $(srcdir)/kcolordialog.h
 	$(MOC) $(srcdir)/kcolordialog.h -o kcolordialog.moc
 
@@ -2185,7 +2194,7 @@
 
 #>+ 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 kswitchlanguagedialog.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kmenubar.moc knumvalidator.moc
+	-rm -f  kcommand.moc kruler.moc kcompletionbox.moc kactionclasses.moc kauthicon.moc knuminput.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc kxmlguifactory.moc klistviewlineedit.moc kbuttonbox.moc kcombobox.moc klistbox.moc kscrollview.moc ktabbar.moc krootpixmap.moc ksystemtray.moc klistview.moc kpassdlg.moc klineeditdlg.moc kwizard.moc kkeybutton.moc kpopupmenu.moc kprogress.moc kmainwindow.moc kcharselect.moc kpixmapregionselectorwidget.moc kdialog.moc ktabwidget.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc ktextbrowser.moc kspell.moc kiconviewsearchline.moc kdatepicker.moc khelpmenu.moc ktoolbarradiogroup.moc kdatewidget.moc kanimwidget.moc ktoolbar.moc kaboutdialog_private.moc kcmodule.moc kfontrequester.moc ktimewidget.moc kdockwidget.moc klistviewsearchline.moc klanguagebutton.moc kstatusbar.moc kpanelmenu.moc kdockwindow.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 kpanelapplet.moc ktextedit.moc kseparator.moc ksconfig.moc kcursor_private.moc kpanelappmenu.moc kselect.moc kwindowlistmenu.moc keditcl.moc kfontcombo.moc kdockwidget_private.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kswitchlanguagedialog.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kmenubar.moc knumvalidator.moc
 
 #>+ 2
 KDE_DIST=TODO.xmlgui libkdeui.nmcheck Makefile.in aboutkde.png ktoolbarhandler.h libkdeui_weak.nmcheck MAINTAINERS kshortcutdialog_advanced.ui kspellui.ui ui_standards.rc ktip-bulb.png preparetips ktip-background.png kshortcutdialog_simple.ui TODO.kspell README.kspell kxmlgui.xsd Makefile.am 
@@ -2210,8 +2219,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -2244,7 +2253,7 @@
 
 
 #>+ 11
-libkdeui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qxembed.cpp $(srcdir)/ksharedpixmap.cpp $(srcdir)/kpixmapio.cpp $(srcdir)/kpopupmenu.cpp $(srcdir)/ktoolbar.cpp $(srcdir)/kaction.cpp $(srcdir)/kstdaction.cpp $(srcdir)/kactioncollection.cpp $(srcdir)/kactionclasses.cpp $(srcdir)/kurllabel.cpp $(srcdir)/kmenubar.cpp $(srcdir)/kinputdialog.cpp $(srcdir)/knuminput.cpp $(srcdir)/klineedit.cpp $(srcdir)/klistview.cpp $(srcdir)/kprogress.cpp $(srcdir)/kcolordialog.cpp $(srcdir)/kselect.cpp $(srcdir)/kdatepicker.cpp $(srcdir)/kdatetbl.cpp $(srcdir)/kfontrequester.cpp $(srcdir)/kfontdialog.cpp $(srcdir)/ktabctl.cpp $(srcdir)/kstatusbar.cpp $(srcdir)/kmainwindow.cpp $(srcdir)/keditlistbox.cpp $(srcdir)/kscrollview.cpp $(srcdir)/kseparator.cpp $(srcdir)/krestrictedline.cpp $(srcdir)/kcolorbutton.cpp $(srcdir)/ksystemtray.cpp $(srcdir)/kbuttonbox.cpp $(srcdir)/keditcl1.cpp $(srcdir)/keditcl2.cpp $(srcdir)/kled.cpp $(srcdir)/kshortcutdialog.cpp $(srcdir)/kkeybutton.cpp $(srcdir)/kkeydialog.cpp $(srcdir)/kruler.cpp $(srcdir)/kcursor.cpp $(srcdir)/klineeditdlg.cpp $(srcdir)/kcharselect.cpp $(srcdir)/kcolordrag.cpp $(srcdir)/knumvalidator.cpp $(srcdir)/kdialog.cpp $(srcdir)/kdialogbase.cpp $(srcdir)/kjanuswidget.cpp $(srcdir)/kaboutdialog.cpp $(srcdir)/kauthicon.cpp $(srcdir)/kmessagebox.cpp $(srcdir)/kdualcolorbutton.cpp $(srcdir)/ktoolbarradiogroup.cpp $(srcdir)/ktoolbarbutton.cpp $(srcdir)/ktextbrowser.cpp $(srcdir)/khelpmenu.cpp $(srcdir)/kswitchlanguagedialog.cpp $(srcdir)/kcmenumngr.cpp $(srcdir)/kpanelmenu.cpp $(srcdir)/kiconview.cpp $(srcdir)/klistbox.cpp $(srcdir)/kwordwrap.cpp $(srcdir)/kbugreport.cpp $(srcdir)/kcombobox.cpp $(srcdir)/kpassdlg.cpp $(srcdir)/kxmlguiclient.cpp $(srcdir)/kxmlguifactory.cpp $(srcdir)/kxmlguifactory_p.cpp $(srcdir)/kxmlguibuilder.cpp $(srcdir)/kedittoolbar.cpp $(srcdir)/kpanelappmenu.cpp $(srcdir)/kdockwidget.cpp $(srcdir)/kdockwidget_private.cpp $(srcdir)/kanimwidget.cpp $(srcdir)/krootpixmap.cpp $(srcdir)/kaboutkde.cpp $(srcdir)/kaboutapplication.cpp $(srcdir)/kpanelapplet.cpp $(srcdir)/kdcopactionproxy.cpp $(srcdir)/kcolorcombo.cpp $(srcdir)/kpushbutton.cpp $(srcdir)/kpanelextension.cpp $(srcdir)/kcompletionbox.cpp $(srcdir)/ksqueezedtextlabel.cpp $(srcdir)/kcmodule.cpp $(srcdir)/kcommand.cpp $(srcdir)/kwindowlistmenu.cpp $(srcdir)/kfontcombo.cpp $(srcdir)/ktip.cpp $(srcdir)/kdatewidget.cpp $(srcdir)/karrowbutton.cpp $(srcdir)/kmainwindowiface.cpp $(srcdir)/kguiitem.cpp $(srcdir)/kstdguiitem.cpp $(srcdir)/kstringvalidator.cpp $(srcdir)/kactivelabel.cpp $(srcdir)/kwindowinfo.cpp $(srcdir)/ktextedit.cpp $(srcdir)/kwizard.cpp $(srcdir)/kpassivepopup.cpp $(srcdir)/ktoolbarhandler.cpp $(srcdir)/kdatetimewidget.cpp $(srcdir)/ktimewidget.cpp $(srcdir)/ktimezonewidget.cpp $(srcdir)/ksconfig.cpp $(srcdir)/kspelldlg.cpp $(srcdir)/kspell.cpp $(srcdir)/ksyntaxhighlighter.cpp $(srcdir)/ktabbar.cpp $(srcdir)/ktabwidget.cpp $(srcdir)/ksplashscreen.cpp $(srcdir)/kconfigdialog.cpp $(srcdir)/kactionselector.cpp $(srcdir)/klanguagebutton.cpp $(srcdir)/klistviewsearchline.cpp $(srcdir)/kpixmapregionselectorwidget.cpp $(srcdir)/kpixmapregionselectordialog.cpp $(srcdir)/kwhatsthismanager.cpp $(srcdir)/kiconviewsearchline.cpp $(srcdir)/ktoolbarlabelaction.cpp kmainwindowiface_skel.cpp kshortcutdialog_simple.cpp kshortcutdialog_advanced.cpp kspellui.cpp  kcommand.moc kruler.moc kcompletionbox.moc kactionclasses.moc knuminput.moc kauthicon.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc klistviewlineedit.moc kxmlguifactory.moc kbuttonbox.moc kcombobox.moc klistbox.moc kscrollview.moc ktabbar.moc krootpixmap.moc kshortcutdialog_simple.moc ksystemtray.moc klistview.moc kpassdlg.moc kwizard.moc klineeditdlg.moc kprogress.moc kkeybutton.moc kpopupmenu.moc kmainwindow.moc kpixmapregionselectorwidget.moc kcharselect.moc kdialog.moc ktabwidget.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc ktextbrowser.moc kspell.moc kiconviewsearchline.moc kdatepicker.moc khelpmenu.moc kdatewidget.moc ktoolbarradiogroup.moc kanimwidget.moc ktoolbar.moc kaboutdialog_private.moc kcmodule.moc kspellui.moc ktimewidget.moc kfontrequester.moc klistviewsearchline.moc kdockwidget.moc klanguagebutton.moc kstatusbar.moc kcmenumngr.moc kpanelmenu.moc kdockwindow.moc kfontdialog.moc kled.moc krestrictedline.moc ktoolbarbutton.moc kurllabel.moc kspelldlg.moc kdatetimewidget.moc kinputdialog.moc ksharedpixmap.moc kcolorbutton.moc kedittoolbar.moc kbugreport.moc ktimezonewidget.moc kpushbutton.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc kaboutdialog.moc ksplashscreen.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kstringvalidator.moc kpassivepopup.moc ktabctl.moc kjanuswidget.moc kpanelapplet.moc ktextedit.moc ksconfig.moc kseparator.moc kcursor_private.moc kpanelappmenu.moc kselect.moc kwindowlistmenu.moc kfontcombo.moc keditcl.moc kdockwidget_private.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc kswitchlanguagedialog.moc qxembed.moc kiconview.moc keditlistbox.moc kshortcutdialog_advanced.moc kmenubar.moc knumvalidator.moc
+libkdeui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qxembed.cpp $(srcdir)/ksharedpixmap.cpp $(srcdir)/kpixmapio.cpp $(srcdir)/kpopupmenu.cpp $(srcdir)/ktoolbar.cpp $(srcdir)/kaction.cpp $(srcdir)/kstdaction.cpp $(srcdir)/kactioncollection.cpp $(srcdir)/kactionclasses.cpp $(srcdir)/kurllabel.cpp $(srcdir)/kmenubar.cpp $(srcdir)/kinputdialog.cpp $(srcdir)/knuminput.cpp $(srcdir)/klineedit.cpp $(srcdir)/klistview.cpp $(srcdir)/kprogress.cpp $(srcdir)/kcolordialog.cpp $(srcdir)/kselect.cpp $(srcdir)/kdatepicker.cpp $(srcdir)/kdatetbl.cpp $(srcdir)/kfontrequester.cpp $(srcdir)/kfontdialog.cpp $(srcdir)/ktabctl.cpp $(srcdir)/kstatusbar.cpp $(srcdir)/kmainwindow.cpp $(srcdir)/keditlistbox.cpp $(srcdir)/kscrollview.cpp $(srcdir)/kseparator.cpp $(srcdir)/krestrictedline.cpp $(srcdir)/kcolorbutton.cpp $(srcdir)/ksystemtray.cpp $(srcdir)/kbuttonbox.cpp $(srcdir)/keditcl1.cpp $(srcdir)/keditcl2.cpp $(srcdir)/kled.cpp $(srcdir)/kshortcutdialog.cpp $(srcdir)/kkeybutton.cpp $(srcdir)/kkeydialog.cpp $(srcdir)/kruler.cpp $(srcdir)/kcursor.cpp $(srcdir)/klineeditdlg.cpp $(srcdir)/kcharselect.cpp $(srcdir)/kcolordrag.cpp $(srcdir)/knumvalidator.cpp $(srcdir)/kdialog.cpp $(srcdir)/kdialogbase.cpp $(srcdir)/kjanuswidget.cpp $(srcdir)/kaboutdialog.cpp $(srcdir)/kauthicon.cpp $(srcdir)/kmessagebox.cpp $(srcdir)/kdualcolorbutton.cpp $(srcdir)/ktoolbarradiogroup.cpp $(srcdir)/ktoolbarbutton.cpp $(srcdir)/ktextbrowser.cpp $(srcdir)/khelpmenu.cpp $(srcdir)/kswitchlanguagedialog.cpp $(srcdir)/kcmenumngr.cpp $(srcdir)/kpanelmenu.cpp $(srcdir)/kiconview.cpp $(srcdir)/klistbox.cpp $(srcdir)/kwordwrap.cpp $(srcdir)/kbugreport.cpp $(srcdir)/kcombobox.cpp $(srcdir)/kpassdlg.cpp $(srcdir)/kxmlguiclient.cpp $(srcdir)/kxmlguifactory.cpp $(srcdir)/kxmlguifactory_p.cpp $(srcdir)/kxmlguibuilder.cpp $(srcdir)/kedittoolbar.cpp $(srcdir)/kpanelappmenu.cpp $(srcdir)/kdockwidget.cpp $(srcdir)/kdockwidget_private.cpp $(srcdir)/kanimwidget.cpp $(srcdir)/krootpixmap.cpp $(srcdir)/kaboutkde.cpp $(srcdir)/kaboutapplication.cpp $(srcdir)/kpanelapplet.cpp $(srcdir)/kdcopactionproxy.cpp $(srcdir)/kcolorcombo.cpp $(srcdir)/kpushbutton.cpp $(srcdir)/kpanelextension.cpp $(srcdir)/kcompletionbox.cpp $(srcdir)/ksqueezedtextlabel.cpp $(srcdir)/kcmodule.cpp $(srcdir)/kcommand.cpp $(srcdir)/kwindowlistmenu.cpp $(srcdir)/kfontcombo.cpp $(srcdir)/ktip.cpp $(srcdir)/kdatewidget.cpp $(srcdir)/karrowbutton.cpp $(srcdir)/kmainwindowiface.cpp $(srcdir)/kguiitem.cpp $(srcdir)/kstdguiitem.cpp $(srcdir)/kstringvalidator.cpp $(srcdir)/kactivelabel.cpp $(srcdir)/kwindowinfo.cpp $(srcdir)/ktextedit.cpp $(srcdir)/kwizard.cpp $(srcdir)/kpassivepopup.cpp $(srcdir)/ktoolbarhandler.cpp $(srcdir)/kdatetimewidget.cpp $(srcdir)/ktimewidget.cpp $(srcdir)/ktimezonewidget.cpp $(srcdir)/ksconfig.cpp $(srcdir)/kspelldlg.cpp $(srcdir)/kspell.cpp $(srcdir)/ksyntaxhighlighter.cpp $(srcdir)/ktabbar.cpp $(srcdir)/ktabwidget.cpp $(srcdir)/ksplashscreen.cpp $(srcdir)/kconfigdialog.cpp $(srcdir)/kactionselector.cpp $(srcdir)/klanguagebutton.cpp $(srcdir)/klistviewsearchline.cpp $(srcdir)/kpixmapregionselectorwidget.cpp $(srcdir)/kpixmapregionselectordialog.cpp $(srcdir)/kwhatsthismanager.cpp $(srcdir)/kiconviewsearchline.cpp $(srcdir)/ktoolbarlabelaction.cpp kmainwindowiface_skel.cpp kshortcutdialog_simple.cpp kshortcutdialog_advanced.cpp kspellui.cpp  kcommand.moc kruler.moc kcompletionbox.moc knuminput.moc kauthicon.moc kactionclasses.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc klistviewlineedit.moc kxmlguifactory.moc kbuttonbox.moc klistbox.moc kcombobox.moc kscrollview.moc krootpixmap.moc ktabbar.moc kshortcutdialog_simple.moc ksystemtray.moc klistview.moc kpassdlg.moc kwizard.moc klineeditdlg.moc kprogress.moc kpopupmenu.moc kkeybutton.moc kmainwindow.moc kpixmapregionselectorwidget.moc kcharselect.moc ktabwidget.moc kdialog.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc kiconviewsearchline.moc kspell.moc ktextbrowser.moc khelpmenu.moc kdatepicker.moc kdatewidget.moc ktoolbarradiogroup.moc kaboutdialog_private.moc ktoolbar.moc kanimwidget.moc kcmodule.moc kspellui.moc ktimewidget.moc kfontrequester.moc klistviewsearchline.moc kdockwidget.moc klanguagebutton.moc kstatusbar.moc kcmenumngr.moc kdockwindow.moc kpanelmenu.moc kfontdialog.moc kled.moc krestrictedline.moc ktoolbarbutton.moc kurllabel.moc kspelldlg.moc kdatetimewidget.moc kinputdialog.moc ksharedpixmap.moc kcolorbutton.moc kedittoolbar.moc kbugreport.moc ktimezonewidget.moc kpushbutton.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc kaboutdialog.moc ksplashscreen.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kstringvalidator.moc kpassivepopup.moc ktabctl.moc kjanuswidget.moc ktextedit.moc kpanelapplet.moc ksconfig.moc kseparator.moc kpanelappmenu.moc kcursor_private.moc kselect.moc kwindowlistmenu.moc kdockwidget_private.moc kfontcombo.moc keditcl.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc kswitchlanguagedialog.moc qxembed.moc kiconview.moc keditlistbox.moc kshortcutdialog_advanced.moc kmenubar.moc knumvalidator.moc
 	@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
 	rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/about/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeui/about/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -379,12 +385,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -395,8 +401,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -417,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:
@@ -596,8 +602,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/colors/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeui/colors/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -360,12 +366,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -376,8 +382,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -398,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:
@@ -564,8 +570,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/kdetrayproxy/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeui/kdetrayproxy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -63,7 +63,9 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kded_kdetrayproxy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/kded/libkdeinit_kded.la
 am_kded_kdetrayproxy_la_OBJECTS = kdetrayproxy.lo module.lo
 #>- kded_kdetrayproxy_la_OBJECTS = $(am_kded_kdetrayproxy_la_OBJECTS)
 #>+ 4
@@ -121,6 +123,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -235,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@
@@ -263,6 +266,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -272,6 +276,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -300,6 +305,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -350,6 +356,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -407,6 +414,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -420,7 +428,7 @@
 #>+ 1
 kded_kdetrayproxy_la_SOURCES=kdetrayproxy.cpp module.cpp  module_skel.cpp
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED)
+kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
 #>- METASOURCES = AUTO
 noinst_HEADERS = kdetrayproxy.h module.h
 servicesdir = $(kde_servicesdir)/kded
@@ -431,12 +439,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -447,8 +455,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -469,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -561,7 +569,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -789,8 +797,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/kdetrayproxy/kdetrayproxy.desktop
+++ kdelibs-3.5.10.dfsg.1/kdeui/kdetrayproxy/kdetrayproxy.desktop
@@ -132,3 +132,4 @@
 X-KDE-Library=kdetrayproxy
 X-KDE-FactoryName=kdetrayproxy
 X-KDE-Kded-autoload=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdeui/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdeui/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -538,6 +538,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -652,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@
@@ -680,6 +681,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -689,6 +691,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -717,6 +720,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -767,6 +771,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -824,6 +829,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -900,12 +906,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -916,8 +922,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -938,9 +944,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:
@@ -1217,7 +1223,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1525,6 +1531,13 @@
 mocs: klineedittest.moc
 
 #>+ 3
+ktabctltest.moc: $(srcdir)/ktabctltest.h
+	$(MOC) $(srcdir)/ktabctltest.h -o ktabctltest.moc
+
+#>+ 2
+mocs: ktabctltest.moc
+
+#>+ 3
 kledtest.moc: $(srcdir)/kledtest.h
 	$(MOC) $(srcdir)/kledtest.h -o kledtest.moc
 
@@ -1539,13 +1552,6 @@
 mocs: kunbalancedgrdtest.moc
 
 #>+ 3
-ktabctltest.moc: $(srcdir)/ktabctltest.h
-	$(MOC) $(srcdir)/ktabctltest.h -o ktabctltest.moc
-
-#>+ 2
-mocs: ktabctltest.moc
-
-#>+ 3
 kdockwidgetdemo.moc: $(srcdir)/kdockwidgetdemo.h
 	$(MOC) $(srcdir)/kdockwidgetdemo.h -o kdockwidgetdemo.moc
 
@@ -1554,7 +1560,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kwindowtest.moc kmainwindowrestoretest.moc kstatusbartest.moc ktabwidgettest.moc khashtest.moc itemcontainertest.moc kdockwidgettest.moc kcompletiontest.moc knuminputtest.moc kmainwindowtest.moc kxmlguitest.moc kdualcolortest.moc kcomboboxtest.moc krulertest.moc kpanelmenutest.moc kdocktest.moc kdesattest.moc klineedittest.moc kledtest.moc kunbalancedgrdtest.moc ktabctltest.moc kdockwidgetdemo.moc
+	-rm -f  kwindowtest.moc kmainwindowrestoretest.moc kstatusbartest.moc ktabwidgettest.moc khashtest.moc itemcontainertest.moc kdockwidgettest.moc kcompletiontest.moc knuminputtest.moc kmainwindowtest.moc kxmlguitest.moc kdualcolortest.moc kcomboboxtest.moc krulertest.moc kpanelmenutest.moc kdocktest.moc kdesattest.moc klineedittest.moc ktabctltest.moc kledtest.moc kunbalancedgrdtest.moc kdockwidgetdemo.moc
 
 #>+ 2
 KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png kxmlguitest.h khashtest.h kwindowtest.h klineedittest.h kledtest.h kcomboboxtest.h kdockwidgetdemo.h krulertest.h kcolortest.h kalphaicontest.h kblendtest.h kgradienttest.h itemcontainertest.h kxmlguitest_part.rc kpanelmenutest.h testimage.png go.png kdesattest.h Makefile.am 
@@ -1567,8 +1573,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs4-dev.docs
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4-dev.docs
@@ -0,0 +1,3 @@
+DEBUG
+NAMING
+README
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs-data.install
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs-data.install
@@ -0,0 +1,4036 @@
+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/pdf2ps.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/pdf2ps.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/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/underLGPL.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/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/underLGPL.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/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/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/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-zip-compressed.desktop
+debian/tmp/usr/share/mimelnk/application/x-zoo.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/mimelnk/application/x-nzb.desktop
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs4c2a.install
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4c2a.install
@@ -0,0 +1,293 @@
+debian/tmp/etc/kde3/khotnewstuffrc
+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/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/ktelnetservice
+debian/tmp/usr/bin/ktradertest
+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/meinproc
+debian/tmp/usr/bin/start_kdeinit
+debian/tmp/usr/bin/start_kdeinit_wrapper
+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/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/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.10.dfsg.1.orig/debian/kdelibs-data.preinst
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kdelibs4c2a.links
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kdelibs4c2a.lintian
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4c2a.lintian
@@ -0,0 +1,18 @@
+kdelibs4c2a: setuid-binary usr/bin/fileshareset 4755 root/root
+kdelibs4c2a: setuid-binary usr/bin/kgrantpty 4755 root/root
+kdelibs4c2a: setuid-binary usr/bin/kpac_dhcp_helper 4755 root/root
+kdelibs4c2a: setuid-binary usr/bin/start_kdeinit 4755 root/root
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kaddprinterwizard.so for usr/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_klauncher.so for usr/lib/libkdeinit_klauncher.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kio_uiserver.so for usr/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kio_http_cache_cleaner.so for usr/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kded.so for usr/lib/libkdeinit_kded.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kcookiejar.so for usr/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_dcopserver.so for usr/lib/libkdeinit_dcopserver.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kbuildsycoca.so for usr/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kconf_update.so for usr/lib/libkdeinit_kconf_update.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_cupsdconf.so for usr/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a: shlib-missing-in-control-file libkdeinit_kcmshell.so for usr/lib/libkdeinit_kcmshell.so
+kdelibs4c2a: package-name-doesnt-match-sonames libDCOP4 libartskde1 libkabc1 libkabc-dir1 libkabc-file1 libkabc-ldapkio1 libkatepartinterfaces0 libkdecore4 libkdefakes4 libkdefx4 libkdeinit-cupsdconf libkdeinit-dcopserver libkdeinit-kaddprinterwizard libkdeinit-kbuildsycoca libkdeinit-kcmshell libkdeinit-kconf-update libkdeinit-kcookiejar libkdeinit-kded libkdeinit-kio-http-cache-cleaner libkdeinit-kio-uiserver libkdeinit-klauncher libkdeprint4 libkdeprint-management4 libkdesasl1 libkdesu4 libkdeui4 libkdnssd1 libkhtml4 libkimproxy0 libkio4 libkjava1 libkjs1 libkmdi1 libkmdi2-1 libkmediaplayer0 libkmid0 libknewstuff1 libkntlm0 libkparts2 libkresources1 libkscreensaver4 libkscript0 libkspell4 libkspell2-1 libktexteditor0 libkunittest1 libkutils1 libkwalletbackend1 libkwalletclient1 libvcard0
+
+
--- kdelibs-3.5.10.dfsg.1.orig/debian/copyright
+++ kdelibs-3.5.10.dfsg.1/debian/copyright
@@ -0,0 +1,43 @@
+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.
+Copyright:
+Unless something else is mentioned, copyright is
+© 1996-2008, The K Desktop Enviroment project http://www.kde.org
+
+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
+  located in /usr/share/common-licenses/GFDL-1.2
--- kdelibs-3.5.10.dfsg.1.orig/debian/control
+++ kdelibs-3.5.10.dfsg.1/debian/control
@@ -0,0 +1,110 @@
+Source: kdelibs
+Section: libs
+Priority: optional
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>, Pino Toscano <pino@kde.org>, Raúl Sánchez Siles <rasasi78@gmail.com>, Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 6), autotools-dev,
+ binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ libart-2.0-dev (>= 2.3.17), libacl1-dev,
+ libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaspell-dev, hspell, libbz2-dev, libcups2-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), 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), 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.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdelibs
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdelibs
+
+Package: kdelibs
+Section: libs
+Architecture: all
+Depends: kdelibs4c2a (>= ${binary: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, kdelibs5-data
+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, x11-xserver-utils, xauth,
+ launchpad-integration, sudo
+Recommends: xdg-user-dirs
+Suggests: perl-suid, ghostscript
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1)
+Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
+ kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
+ kdelibs4-dev (= 4:3.5.7.dfsg.1-5)
+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.
+ .
+ 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 (= ${binary:Version}), libart-2.0-dev (>= 2.3.17),
+ ${libasound2-dev}, libacl1-dev, libattr1-dev,
+ libaspell-dev, libbz2-dev, libcups2-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libopenexr-dev (>= 1.2.2-4.1), 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), kdelibs4c2a (<< 4:3.5.8-3ubuntu2)
+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: kdelibs-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Depends: kdelibs4c2a (= ${binary: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.10.dfsg.1.orig/debian/not-installed.list
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/compat
+++ kdelibs-3.5.10.dfsg.1/debian/compat
@@ -0,0 +1 @@
+5
--- kdelibs-3.5.10.dfsg.1.orig/debian/prune-nonfree
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kdelibs4c2a.presubj
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kdelibs4-dev.manpages
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4-dev.manpages
@@ -0,0 +1,5 @@
+./debian/man/kconfig_compiler.1
+./debian/man/ksvgtopng.1
+./debian/man/kunittestmodrunner.1
+./debian/man/makekdewidgets.1
+./debian/man/preparetips.1
--- kdelibs-3.5.10.dfsg.1.orig/debian/KUBUNTU-DEBIAN-CHANGES
+++ kdelibs-3.5.10.dfsg.1/debian/KUBUNTU-DEBIAN-CHANGES
@@ -0,0 +1,24 @@
+make sure control and control.in are in sync
+
+--with-distribution="Kubuntu (`lsb_release --codename --short`) $(DEB_VERSION)"
+binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+don't build-dep on libgamin-dev, libfam-dev
+stop kdelibs4-dev depending on gamin/fam
+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, sudo
+cdbs build-dep 0.4.41ubuntu2
+kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+copy debian/icons over
+Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on xdg-user-dirs
+Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
+remove kdelibs4c2a depends on menu-xdg
+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
+kdelibs-data.install : Add nzb mimetype
+Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
+remove /usr/bin/preparetips from kdelibs4-dev package
+Remove ksvgtopng from kdelibs4-dev (conflicts with kdebase-runtime)
+
+make sure control and control.in are in sync
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs.presubj
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/rules
+++ kdelibs-3.5.10.dfsg.1/debian/rules
@@ -0,0 +1,85 @@
+#! /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
+
+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 \
+	--without-arts
+
+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
+
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.9)'
+
+#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/icons/aboutkde-kubuntu.png.uu -o debian/kdelibs-data/usr/share/apps/kdeui/pics/aboutkde.png
+
+	uudecode debian/icons/cr16-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/16x16/devices/system.png
+	uudecode debian/icons/cr22-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/22x22/devices/system.png
+	uudecode debian/icons/cr32-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/32x32/devices/system.png
+	uudecode debian/icons/cr48-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/48x48/devices/system.png
+	uudecode debian/icons/cr64-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/64x64/devices/system.png
+	uudecode debian/icons/cr128-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/128x128/devices/system.png
+#	uudecode debian/icons/crsc-device-system.svgz.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/scalable/devices/system.svgz
+
+	uudecode debian/icons/cr16-action-hibernate.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/16x16/actions/hibernate.png
+	uudecode debian/icons/cr22-action-hibernate.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/22x22/actions/hibernate.png
+	uudecode debian/icons/cr32-action-hibernate.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/32x32/actions/hibernate.png
+	uudecode debian/icons/cr48-action-hibernate.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/48x48/actions/hibernate.png
+
+	uudecode debian/icons/cr16-action-suspend.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/16x16/actions/suspend.png
+	uudecode debian/icons/cr22-action-suspend.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/22x22/actions/suspend.png
+	uudecode debian/icons/cr32-action-suspend.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/32x32/actions/suspend.png
+	uudecode debian/icons/cr48-action-suspend.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/48x48/actions/suspend.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
+
+	msgcat --use-first kde.pot po/kdelibs.pot > kdelibs.pot-merged
+	mv -f kdelibs.pot-merged po/kdelibs.pot
+
+	# 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
--- kdelibs-3.5.10.dfsg.1.orig/debian/changelog
+++ kdelibs-3.5.10.dfsg.1/debian/changelog
@@ -0,0 +1,4569 @@
+kdelibs (4:3.5.10.dfsg.1-2ubuntu2) karmic; urgency=low
+
+  * Do not install usr/share/locale/all_languages and add depends on
+    kdelibs5-data, Closes LP: #374248
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 25 May 2009 11:27:40 +0100
+
+kdelibs (4:3.5.10.dfsg.1-2ubuntu1) karmic; urgency=low
+
+  * Merge with Debian, remaining changes in KUBUNTU-DEBIAN-CHANGES
+  * Don't add 64_use_sys_inotify.diff, we already have kubuntu_glibc_2.8_ftbfs.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Apr 2009 12:49:44 +0000
+
+kdelibs (4:3.5.10.dfsg.1-2) unstable; urgency=low
+
+  * Add 64_use_sys_inotify.diff patch to fix ftbfs caused by linux/inotify.
+    (Closes: #519881)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Mar 2009 16:59:36 +0100
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu8) jaunty; urgency=low
+
+  * Don't build with arts support (LP: #320915)
+  * Don't build apidox. We don't install them anyway
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 24 Jan 2009 20:28:13 +0100
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu7) jaunty; urgency=low
+
+  * Don't install anything to usr/share/doc/kde/HTML, this path will now be
+    used by KDE 4 (drop all content in favor of KDE 4) (LP: #284915)
+  * Drop the package kdelibs4-doc completely. It contained API documentation
+    which is now obsolete, but still available via api.kde.org.
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sun, 18 Jan 2009 20:37:31 +0100
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu6) jaunty; urgency=low
+
+  * Add kubuntu_98_fix_khc_invocation.diff to invoke khelpcenter's exectuable
+    directly instead of trying to access it via DCOP or start it using it's
+    service file. Both are not available without KDE 3's kdebase (LP: #310135)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sun, 18 Jan 2009 14:24:38 +0100
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu5) jaunty; urgency=low
+
+  * Add back 97_automake_cleanup.diff (as kubuntu_97_automake_cleanup.diff),
+    needed to make libkhtml link to libkjs
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 Dec 2008 18:29:29 +0000
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu4) jaunty; urgency=low
+
+  * Added kubuntu_arm_ftbfs.diff (LP: #300873)
+    - Fixed ARM FTBFS by adding missing headers
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Fri, 21 Nov 2008 13:16:05 -0500
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu3) jaunty; urgency=low
+
+  * Fix build failure, due to missing header includes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 20 Nov 2008 12:11:25 +0100
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu2) jaunty; urgency=low
+
+  * Added kubuntu_glibc_2.8_ftbfs.diff
+    - Corrected FTBFS due to inotify/glibc headers mismatch (LP: #299909)
+  * Updated kubuntu_51_launchpad_integration.diff
+    - Explicately added #include <kstandarddirs.h> in khelpmenu.cpp to
+      resolve a FTBFS on armel
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Wed, 19 Nov 2008 16:34:30 -0500
+
+kdelibs (4:3.5.10.dfsg.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - --with-distribution="Kubuntu (`lsb_release --codename --short`) $(DEB_VERSION)"
+   - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+   - don't build-dep on libgamin-dev, libfam-dev
+   - stop kdelibs4-dev depending on gamin/fam
+   - 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, sudo
+   - cdbs build-dep 0.4.41ubuntu2
+   - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+   - copy debian/icons over
+   - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on xdg-user-dirs
+   - Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
+   - remove kdelibs4c2a depends on menu-xdg
+   - 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
+   - kdelibs-data.install : Add nzb mimetype
+   - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
+   - remove /usr/bin/preparetips from kdelibs4-dev package
+   - Remove ksvgtopng from kdelibs4-dev (conflicts with kdebase-runtime)
+  * Remove kubuntu_66_konsole_pty.diff, no longer needed
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 06 Nov 2008 13:18:46 +0000
+
+kdelibs (4:3.5.10.dfsg.1-1) unstable; urgency=low
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * New upstream release.
+    - Most of the changes were already provided by the patches:
+      - 01_kdelibs_branch_r828883.diff
+      - 02_kate_regression_r777286.diff
+      - 03_start_kdeinit_integer_overflow.diff (provided for CVE-2008-1671)
+      - 05_kate_debianchangelog_default_context_r799980.diff
+      - 06_khtml_rendering_r786289.diff
+    that have been dropped now.
+    - New changes:
+      - Changes for showing KDE 3.5.10 instead of 3.5.9 in the KDE apps.
+      - Fix while saving sessions for multiple scripts. (KDE SVN r837226,
+        KDE bug 166598).
+      - Fix in kdeprint. (KDE SVN r848634)
+      - Avoid showing authentication-dialogue being put behind the application
+        window. (KDE SVN r849216, KDE bug 121803).
+
+  +++ Changes by Raúl Sánchez Siles:
+
+  * kdeprint: Wrong initscript name (cupsys instead of cups) (Closes:
+    #496110)
+  * Fixed 98_buildprep.patch so double compilation works.
+  * Fixed wrong http header parsing, added 61_httpheader_backport.diff
+  * Fixed wrong Google Maps rendering, added 62_fix_googlemaps_backport.diff
+  * Change dependencies from obsolete libcupsys2-dev to libcups2-dev.
+  * konqueror: Crash on eBay page (Closes: #502459) with recently added
+    63_fixed-layout-table.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 26 Oct 2008 21:21:12 +0100
+
+kdelibs (4:3.5.10-0ubuntu6) intrepid; urgency=low
+
+  * Don't install launchpad.png icon, now in kdelibs5-data
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 06 Oct 2008 15:39:39 +0100
+
+kdelibs (4:3.5.10-0ubuntu5) intrepid; urgency=low
+
+  * Re-enabled inotify by backporting amd64 fix for
+    inotify from kdelibs SVN
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Wed, 10 Sep 2008 18:57:38 -0400
+
+kdelibs (4:3.5.10-0ubuntu4) intrepid; urgency=low
+
+  * Corrected FTBFS on amd64 by disabling inotify, which is broken
+    due to a glibc/linux headers disagreement on flock.
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Tue, 09 Sep 2008 19:15:07 -0400
+
+kdelibs (4:3.5.10-0ubuntu3) intrepid; urgency=low
+
+  * Revert unintentional changes, caused in 4:3.5.10-0ubuntu2 by an unclean
+    source tree
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 06 Sep 2008 20:55:24 +0200
+
+kdelibs (4:3.5.10-0ubuntu2) intrepid; urgency=low
+
+  * Remove ksvgtopng from kdelibs4-dev (conflicts with kdebase-runtime)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 05 Sep 2008 16:30:10 +0200
+
+kdelibs (4:3.5.10-0ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #258458). Remaining Ubuntu changes:
+    + debian/control.in:
+      - modify libavahi-client-dev and libavahi-qt3-dev version to >= 0.6.23 in
+        Build-Depends and kdelibs4-dev Depends fields
+      - update Standards-Version to 3.8.0
+    + remove /usr/bin/preparetips from kdelibs4-dev package
+    + fix substvar-source-version-is-deprecated lintian warning
+    + fix build-depends-on-essential-package-without-using-version lintian error
+    + all the other changes are listed in debian/KUBUNTU-DEBIAN-CHANGES.
+  * New upstream release.
+  * Drop 02_kate_regression_r777286, 01_kdelibs_branch_r828883,
+    03_start_kdeinit_integer_overflow, 06_khtml_rendering_r786289 patches,
+    merged upstream.
+  * Update 05_kate_debianchangelog_default_context_r799980 patch.
+
+ -- Devid Antonio Filoni <d.filoni@ubuntu.com>  Thu, 21 Aug 2008 17:06:18 +0200
+
+kdelibs (4:3.5.9.dfsg.1-6) unstable; urgency=medium
+
+  * Fix kdepart freeze with some replacements. (Closes: #482268)
+    Many thanks to Steve Cotton.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 08 Jul 2008 22:53:51 +0200
+
+kdelibs (4:3.5.9.dfsg.1-5) unstable; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Add ghostscript Suggests to kdelibs4c2a, as kdeprint can print to PDF
+    using ps2pdf. (Closes: #411348)
+
+  +++ Changes by Armin Berres:
+
+  * Disable debug output of KMail by default.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * KDE_3_5_BRANCH update (up to r828883):
+    - Translation updates in desktop files.
+    - Update kate syntax highlighting files. (Closes:#482529)
+    - Some others small bugfixes.
+  * Update lintian overrides.
+  * Update copyright notice.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 07 Jul 2008 01:40:24 +0200
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu6) intrepid; urgency=low
+
+  * debian/control.in: modify libavahi-client-dev and libavahi-qt3-dev version
+    to >= 0.6.23 in Build-Depends and kdelibs4-dev Depends fields, the new
+    avahi fixes its shlibs.
+
+ -- Devid Filoni <d.filoni@techemail.com>  Sun, 27 Jul 2008 22:08:07 +0200
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu5) intrepid; urgency=low
+
+  * debian/control.in: change libcupsys2-dev to libcups2-dev in Build-Depends
+    and kdelibs4-dev Depends fields.
+  * Fix substvar-source-version-is-deprecated lintian warning.
+  * Fix build-depends-on-essential-package-without-using-version lintian error.
+  * Update Standards-Version to 3.8.0.
+
+ -- Devid Filoni <d.filoni@techemail.com>  Fri, 25 Jul 2008 22:24:43 +0200
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu4) intrepid; urgency=low
+
+  * Remove /usr/bin/preparetips from kdelibs4-dev package because it is already
+    in kdesdk-scripts package (and kdelibs4-dev depends on it).
+
+ -- Devid Filoni <d.filoni@techemail.com>  Thu, 24 Jul 2008 20:47:22 +0200
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu3) intrepid; urgency=low
+
+  * Add missing file kde.pot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 09 May 2008 19:00:57 +0100
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu2) intrepid; urgency=low
+
+  * Add missing file kubuntu_01_kdepot.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 09 May 2008 16:11:07 +0100
+
+kdelibs (4:3.5.9.dfsg.1-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - updated copyright information in alocal.m4
+    - updated maintainer/uploader information in debian/control
+    - bumped Standards-Version 3.7.3 in debian/control
+    - added Depends launchpad-integration for kdelibs4c2a in debian/control.in
+    - Kubuntu uses a newer version of automake in /debian/patches/common/update.sh
+    - --with-distribution="Kubuntu (`lsb_release --codename --short`) $(DEB_VERSION)"
+    - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+    - don't build-dep on of libgamin-dev, libfam-dev
+    - stop kdelibs4-dev depending on gamin/fam
+    - 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, sudo
+    - cdbs build-dep 0.4.41ubuntu2
+    - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+    - copy debian/icons over
+    - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on xdg-user-dirs
+    - Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
+    - remove kdelibs4c2a depends on menu-xdg
+    - 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
+    - kdelibs-data.install : Add nzb mimetype
+    - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
+    - Removed patches merged upstream:
+      kubuntu_52_xinerama.diff
+      kubuntu_98_kate_paste_cursor.diff
+    - remove 98_buildprep.diff
+    - change Debian's 19_debianize_useragent.diff to kubuntu_19_debianize_useragent.diff
+
+ -- Richard Birnie <Arbyuk@googlemail.com>  Thu, 01 May 2008 01:57:54 +0100
+
+kdelibs (4:3.5.9.dfsg.1-4) unstable; urgency=low
+
+  * Add 03_start_kdeinit_integer_overflow.diff patch to fix a security
+    advisory: CVE-2008-1671 start_kdeinit multiple vulnerabilities.
+    (Closes: #478024)
+  * Add 05_kate_debianchangelog_default_context_r799980 patch to give a name
+    to the default context in kate debian changelog/control support.
+    Thanks to Pino Toscano.
+  * Add 06_khtml_rendering_r786289 patch to fix khtml crash when rendering some
+    pages. (Closes: #476896)
+
+ -- Fathi Boudra <fabo@debian.org>  Sun, 27 Apr 2008 17:26:36 +0200
+
+kdelibs (4:3.5.9.dfsg.1-2) unstable; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Add Conflicts against kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1) to
+    kdelibs4c2a package to avoid partitial upgrades. kio_fish.so shipped in
+    earlier versions of kdebase-kio-plugins is incompatible with
+    automake-cleaned kdelibs4c2a.
+  * Bump shlibs to 3.5.9
+
+  +++ Changes by Fathi Boudra:
+
+  * Add 02_kate_regression_r777286 patch to fix wrong cusor position when
+    copy/paste multi-line test block.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 09 Mar 2008 12:41:03 +0200
+
+kdelibs (4:3.5.9.dfsg.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela:
+
+  * Remove hspell from kdelibs4-dev dependencies. It is not needed (anymore?)
+
+  +++ Changes by Fathi Boudra:
+
+  * Remove patches merged upstream:
+    * 00_detect-autoconf.diff
+    * 01_qxembed-create-fix_branch_r757346.diff
+    * 50_handle_timestamps.diff
+    * 51_fix_http_regression.diff
+    * 52_kselectaction_fix_upstream.diff
+    * 56_fix_acid3_test_segfault.diff
+
+  +++ Changes by Modestas Vainius:
+
+  * Add automake clean up patches:
+    - 01_admin_cleanup.diff
+    - 97_automake_cleanup.diff
+  * Drop PACKAGES_WITH_LIBS from debian/rules. It's no longer needed.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Remove -1-revision from libtiff4-dev build dependency.
+  * Replace remaining Source-Version variable with source:Version.
+  * Fix format problems in man/kdeinit.1 and man/imagetops.1
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 02 Mar 2008 04:49:19 +0100
+
+kdelibs (4:3.5.9-0ubuntu7) hardy; urgency=low
+
+  * Update debian/patches/kubuntu_55_printer_sharing.diff to run
+    system-config-printer-kde to let users enable printer sharing
+    rather than the old cups settings scripts.  Closes LP: #208381
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Apr 2008 00:03:28 +0100
+
+kdelibs (4:3.5.9-0ubuntu6) hardy; urgency=low
+
+  * Renamed kubuntu_99_system_config_printer_applet.diff to
+    kubuntu_9901_system_config_printer_applet.diff
+  * Added kubuntu_9902_kde4_kded_blacklist_modules.diff, don't autoload
+    every kded modules in KDE4, replace kubuntu_9924_kde4_no_medianotifier.diff
+    from kdebase
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Fri, 28 Mar 2008 19:49:46 +0100
+
+kdelibs (4:3.5.9-0ubuntu5) hardy; urgency=low
+
+  * Add kubuntu_99_system_config_printer_applet.diff, don't show
+    printer applet if system-config-printer-applet-kde is installed
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Mar 2008 17:34:49 +0000
+
+kdelibs (4:3.5.9-0ubuntu4) hardy; urgency=low
+
+  * Fixed debian/rules, msgcat keeps the first headers only.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Mar 2008 21:19:46 +0100
+
+kdelibs (4:3.5.9-0ubuntu3) hardy; urgency=low
+
+  [ Jonathan Riddell ]
+  * Add kubuntu_98_kate_paste_cursor.diff from upstream
+    Fixes http://bugs.kde.org/158069 "wrong cursor possition after Paste"
+
+  [ Anthony Mercatante ]
+  * Fixed debian/rules, running msgcat for kdelibs.pot in
+    common-install-prehook-impl target in order to proceed
+    earlier for Rosetta pot file export.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Mar 2008 16:20:44 +0100
+
+kdelibs (4:3.5.9-0ubuntu2) hardy; urgency=low
+
+  * Update kubuntu_93_speedbar_xdg_user_dirs.diff. Folder names in the
+    speedbar are going first_char_upper and Documents now has a nice
+    icon.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Mar 2008 12:53:03 +0100
+
+kdelibs (4:3.5.9-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
+
+kdelibs (4:3.5.8.dfsg.1-7) unstable; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Add kdelibs4c2a dependency on xauth. Since kdebase does not depends
+    anymore on xbase-clients. (Closes: #462777)
+
+  +++ Changes by Fathi Boudra:
+
+  * Add patch to fix segfault in acid3 test. (Closes: #460196)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 28 Jan 2008 11:16:47 +0100
+
+kdelibs (4:3.5.8.dfsg.1-6) unstable; urgency=low
+
+  +++ Changes by Armin Berres:
+
+  * Add patch to disable debug information by default. They can be enabled
+    with kdebugdialog. (Closes: #458807, #455815)
+  * Set shlibs version to 4:3.5.8.dfsg.1-5. (Closes: #459005)
+
+  +++ Changes by Fathi Boudra:
+
+  * Update flash plugin patch:
+    - Fix embedding started from outside by reparenting inside to QXEmbed.
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Change dependency for iceauth from xbase-clients to x11-xserver-utils.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 08 Jan 2008 10:39:59 +0100
+
+kdelibs (4:3.5.8.dfsg.1-5) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Remove GFDL license from copyright file and point to
+    /usr/share/common-licenses
+  * Add lintian overrides
+  * Replace Source-Version with binary:Version
+  * Bump standards
+
+  +++ Changes by Fathi Boudra:
+
+  * Add patch to fix detect-autoconf.pl script: compare automake version
+    properly.
+  * Add patch to support latest flash plugin. It consists of 2 parts patches.
+    This the first part. Second part is in kdebase.
+  * Add Seli patch (first part) for Xinerama improvements.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Dec 2007 19:45:33 +0100
+
+kdelibs (4:3.5.8.dfsg.1-4) unstable; urgency=low
+
+  * Add a patch to allow to dlopen .so files and not only .la files.
+    Now kamera, digikam and others doesn't need to depend on -dev packages.
+
+ -- Sune Vuorela <debian@pusling.com>  Mon, 12 Nov 2007 13:00:41 +0100
+
+kdelibs (4:3.5.8.dfsg.1-3) unstable; urgency=low
+
+  * Bump shlibs. This is needed as there is a wrapper script introduced in
+    kdelibs.
+  * Pull patch from usptream to fix issue with zoom settings in kpdf, kview
+    and many other applications.
+
+ -- Sune Vuorela <debian@pusling.com>  Tue, 23 Oct 2007 00:17:32 +0200
+
+kdelibs (4:3.5.8.dfsg.1-2) unstable; urgency=low
+
+  * Patch 50_handle_timestamps to handle properly X timestamps  that are so
+    high that they cannot be represented properly as signed long, only unsigned.
+  * Patch 51_fix_http_regression fixing regression in the KIO HTTP slave.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 20 Oct 2007 02:55:44 +0200
+
+kdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #444383, #328479, #425741)
+  * Resync patches:
+    - Remove, applied upstream:
+      01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
+      48_cups13, 55_several-CVE-kdelibs-kdecore.
+  * Update *.install files.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
+
+kdelibs (4:3.5.8-4ubuntu11) hardy; urgency=low
+
+  * Add patch kubuntu_98_kate_newline.diff from Sergei Ivanov
+    <svivanov@pdmi.ras.ru>, closes LP: #184675 "kate does not show
+    newline inserted at the beginning"
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 08 Feb 2008 14:04:02 +0000
+
+kdelibs (4:3.5.8-4ubuntu10) hardy; urgency=low
+
+  * Updated kubuntu_96_flash_xembed.diff:
+    - Sync with current svn status.
+    - Reported to make flash works again this time
+    - Closes LP: #184149
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 30 Jan 2008 17:38:47 +0100
+
+kdelibs (4:3.5.8-4ubuntu9) hardy; urgency=low
+
+  *   * Updated kubuntu_96_flash_xembed.diff:     - Sync with current
+    svn status.     - Reported to make flash works again this time
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 30 Jan 2008 17:38:26 +0100
+
+kdelibs (4:3.5.8-4ubuntu8) hardy; urgency=low
+
+  * Fix path to hicolor icons in kubuntu_97_kde4_menu_applications.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Jan 2008 16:38:45 +0000
+
+kdelibs (4:3.5.8-4ubuntu7) hardy; urgency=low
+
+  * Add kubuntu_97_kde4_menu_applications.diff modified from SuSE, run KDE 4
+    apps without wrapper scripts
+  * Move xdg-user-dirs from Depends to Recommends, Closes LP: #186365
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 28 Jan 2008 18:07:39 +0000
+
+kdelibs (4:3.5.8-4ubuntu6) hardy; urgency=low
+
+  * Added kubuntu_96_flash_xembed.diff:
+    - Fix from KDE svn
+    - Partially fixes flash 9 breaking in konqueror. May not
+      always work...
+
+ -- Anthony Mercatante <tonio@kubuntu.org>  Tue, 22 Jan 2008 17:24:14 +0100
+
+kdelibs (4:3.5.8-4ubuntu5) hardy; urgency=low
+
+  * Add depends on xdg-user-dirs, Closes LP: #175982
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Jan 2008 10:46:06 +0000
+
+kdelibs (4:3.5.8-4ubuntu4) hardy; urgency=low
+
+  [ Frode M. Døving ]
+  * Add kubuntu_95_kurl-not-so-pretty.diff
+    Closes: LP #162233 , KDE Bug: #150973
+    kurl prettyUrl corrupts original url.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 17:29:27 +0000
+
+kdelibs (4:3.5.8-4ubuntu3) hardy; urgency=low
+
+  * Rebuild for libopenexr transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Dec 2007 09:50:59 +0000
+
+kdelibs (4:3.5.8-4ubuntu2) hardy; urgency=low
+
+  * Add kubuntu_95_fix_smb_scan.diff from Guillaume Martres, fixes SMB
+    printer browsing.  Closes LP: #57666
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 07 Dec 2007 18:11:39 +0000
+
+kdelibs (4:3.5.8-4ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, adds 53_kdelibs_ltdl_ext.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 18:22:18 +0000
+
+kdelibs (4:3.5.8.dfsg.1-4) unstable; urgency=low
+
+  * Add a patch to allow to dlopen .so files and not only .la files.
+    Now kamera, digikam and others doesn't need to depend on -dev packages.
+
+ -- Sune Vuorela <debian@pusling.com>  Mon, 12 Nov 2007 13:00:41 +0100
+
+kdelibs (4:3.5.8-3ubuntu2) hardy; urgency=low
+
+  * Add kubuntu_93_speedbar_xdg_user_dirs.diff,
+    kubuntu_93_xdg_dirs_document_path.diff, kubuntu_94_xdg_dirs_i18n.diff
+    from Mandriva, adds support for XDG home dirs
+  * Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 15:10:40 +0000
+
+kdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - --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
+   - stop kdelibs4-dev depending on gamin/fam
+   - 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, sudo
+   - cdbs build-dep 0.4.41ubuntu2
+   - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+   - copy debian/icons over
+   - Make kdelibs4c2a depend on launchpad-integration
+   - Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
+   - remove kdelibs4c2a depends on menu-xdg
+   - 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
+   - kdelibs-data.install : Add nzb mimetype
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 18:18:05 +0000
+
+kdelibs (4:3.5.8.dfsg.1-3) unstable; urgency=low
+
+  * Bump shlibs. This is needed as there is a wrapper script introduced in
+    kdelibs.
+  * Pull patch from usptream to fix issue with zoom settings in kpdf, kview
+    and many other applications.
+
+ -- Sune Vuorela <debian@pusling.com>  Tue, 23 Oct 2007 00:17:32 +0200
+
+kdelibs (4:3.5.8.dfsg.1-2) unstable; urgency=low
+
+  * Patch 50_handle_timestamps to handle properly X timestamps  that are so
+    high that they cannot be represented properly as signed long, only unsigned.
+  * Patch 51_fix_http_regression fixing regression in the KIO HTTP slave.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 20 Oct 2007 02:55:44 +0200
+
+kdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #444383, #328479, #425741)
+  * Resync patches:
+    - Remove, applied upstream:
+      01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
+      48_cups13, 55_several-CVE-kdelibs-kdecore.
+  * Update *.install files.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
+
+kdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Add appropriate Replaces headers for the files moved in -5 and -6. Remove
+    unneeded Conflict in kdelibs4-dev against kdelibs4c2a introduced in -6.
+    (Closes: #439515, #439779)
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add patch 55_several-CVE-kdelibs-kdecore.diff to make Konqueror address
+    bar more robust against addressbar spoofing.
+    Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 30 Aug 2007 07:18:06 +0200
+
+kdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
+
+  * Move back kstartupconfig to kdelibs4c2a. (Closes: #439411)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 25 Aug 2007 03:09:34 +0200
+
+kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add patch 48_cups13.diff to build against new CUPS 1.3.0.
+    Patch by Tim Waugh. (Closes: #438558)
+  * Add patch 48_hurd_support.diff to fix FTBFS on hurd-i386.
+    Patch by Samuel Thibault. (Closes: #438952)
+
+  +++ Changes by Fathi Boudra:
+
+  * Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng,
+    kunittestmodrunner, makekdewidgets, preparetips.
+    Allow kdelibs5-dev co-installable alongside kdelibs4c2a.
+
+  * Suggests perl-suid instead Recommends. (Closes: #437414)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 23 Aug 2007 07:24:52 +0200
+
+kdelibs (4:3.5.7.dfsg.1-4) unstable; urgency=low
+
+  * Versioned kdelibs-bin conflict and remove Provides: kdelibs-bin to
+    allow kde4libs co-installable along with this kdelibs version.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 12 Aug 2007 00:50:16 +0200
+
+kdelibs (4:3.5.7.dfsg.1-3) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Relax uploaders.mk (Closes: #434259)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Jul 2007 21:45:43 +0200
+
+kdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Reorder stuff in kde-applications.menu to get changing menu entries
+    working. (Closes: #254948)
+  * Add patch to fix issue with saving after redo in kate. (Closes: #431920)
+  * Better error messages when opening a tty fails. Thanks to Robert Millan.
+    (Closes: #334974)
+  * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470)
+  * Make sure kdeinit closes all files before terminating kde. (Closes: #425314)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
+
+kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
+
+  * Sync hardy with gutsy-proposed
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 27 Oct 2007 16:23:56 +0100
+
+kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
+
+  * Add kubuntu_94_kselectaction.diff Closes: LP #155144
+    Editable KSelectAction stopped working for custom values
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
+
+kdelibs (4:3.5.8-0ubuntu3) gutsy-proposed; urgency=low
+
+  * Update kubuntu_93_https_fix.diff closes LP: #153500
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Oct 2007 21:40:16 +0100
+
+kdelibs (4:3.5.8-0ubuntu2) gutsy; urgency=low
+
+  * Add kubuntu_93_https_fix.diff closes LP: #152449
+    HTTPS not working with Konqueror 3.5.8
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 16 Oct 2007 16:29:24 +0100
+
+kdelibs (4:3.5.8-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 09:37:39 +0100
+
+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.7-1ubuntu15) gutsy; urgency=low
+
+  * SECURITY UPDATE: URL spoofing via trailing spaces
+  * Add kubuntu_98_trailing_spaces_fix.diff: upstream fixes.
+  * References
+    CVE-2007-4225
+    http://www.kde.org/info/security/advisory-20070914-1.txt
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 23:07:11 +0100
+
+kdelibs (4:3.5.7-1ubuntu14) gutsy; urgency=low
+
+  * Added kubuntu_96_cups_1.3_compatibility.diff.
+    Fixes FTBFS against cups 1.3
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 28 Aug 2007 13:14:47 +0200
+
+kdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
+
+  * Droped kubuntu_93_kdelibs_kdesudo_support_fade_effect.diff, still
+    causes building issues. We'll have to take care with the next
+    version of the patch.
+  * Droped kubuntu_57_nomediaioslave_fileio.diff and
+    kubuntu_59_nomediaioslave_kfile_speedbar.diff:
+    -  it's been decided to switch back to the standard media:/
+       protocol, as /media create as many problems as it resolves...
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 27 Jul 2007 17:17:26 +0200
+
+kdelibs (4:3.5.7-1ubuntu12) gutsy; urgency=low
+
+  * Added kubuntu_93_kdelibs_kdesudo_support_fade_effect.diff. Support
+    for kdesudo without causing troubles with other apps. Patch by
+    Stefan Skotte <sfs@enhance-it.dk>
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 18 Jul 2007 23:34:52 +0200
+
+kdelibs (4:3.5.7-1ubuntu11) gutsy; urgency=low
+
+  * Droped kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff
+    temporary, as that causes troubles building kde applications using
+    KDialogbase.
+    Will had the patch back once fixed to be less sensitive
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 17 Jul 2007 12:10:22 +0100
+
+kdelibs (4:3.5.7-1ubuntu10) gutsy; urgency=low
+
+  * Removed kubuntu_61_hibernate_icons.diff.uu, added the icons uuencoded
+    to debian/icons folder
+    Unifies the way icons are added and avoids launching buildprep to
+    build on i386
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 14 Jul 2007 22:47:06 +0200
+
+kdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low
+
+  [ Anthony Mercatante ]
+  * Fixed kubuntu_91_execute_feedback.patch again, improving the speed
+    of the effect to 3
+
+  [ Sarah Hobbs ]
+  * Added kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff.
+    Thankyou to Stefan Skotte for this patch
+  * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption
+    (LP: #47455, KDE bug #147454)
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 14 Jul 2007 01:51:38 +1000
+
+kdelibs (4:3.5.7-1ubuntu8) gutsy; urgency=low
+
+  * Fixed kubuntu_91_execute_feedback.diff, slows down the animation.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 11 Jul 2007 09:17:21 +0200
+
+kdelibs (4:3.5.7-1ubuntu7) gutsy; urgency=low
+
+  * Added XS-Vcs-Bzr:
+     https://code.launchpad.net/~kubuntu-members/kdelibs/debian, committed code
+     to bzr
+  * Added kubuntu_70_fileshareset-nfs-kernel-server.diff. Thanks to
+    dystopianray for this patch (LP #107403)
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 04 Jul 2007 14:57:25 +1000
+
+kdelibs (4:3.5.7-1ubuntu6) gutsy; urgency=low
+
+  * Applied buildprep to regenerate makefiles, needed for suspend and
+    hibernate icons to be installed. Fixes ftbfs on i386. The great
+    question is now to understand why did that work on other
+    architectures...
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Jul 2007 18:04:56 +0200
+
+kdelibs (4:3.5.7-1ubuntu5) gutsy; urgency=low
+
+  * Fix patch kubuntu_03_applications_menu_entries_move.diff to not
+    conflict with earlier patches.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Jun 2007 21:46:56 +0100
+
+kdelibs (4:3.5.7-1ubuntu4) gutsy; urgency=low
+
+  * Update kubuntu_03_applications_menu_entries_move.diff to include
+    ooo-draw in Office menu
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jun 2007 16:28:26 +0100
+
+kdelibs (4:3.5.7-1ubuntu3) gutsy; urgency=low
+
+  * Remove dependency on libgamin from kdelibs4-dev
+  * Build-dep on libjasper-dev not libjasper-1.700-2-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 13:54:20 +0100
+
+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.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.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.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-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-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.10.dfsg.1.orig/debian/kdelibs4c2a.manpages
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4c2a.manpages
@@ -0,0 +1,46 @@
+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/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/ktradertest.1
+./debian/man/make_driver_db_cups.1
+./debian/man/make_driver_db_lpr.1
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs4c2a.docs
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4c2a.docs
@@ -0,0 +1 @@
+README
--- kdelibs-3.5.10.dfsg.1.orig/debian/control.in
+++ kdelibs-3.5.10.dfsg.1/debian/control.in
@@ -0,0 +1,122 @@
+Source: kdelibs
+Section: libs
+Priority: optional
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>, Pino Toscano <pino@kde.org>, Raúl Sánchez Siles <rasasi78@gmail.com>, Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 6), autotools-dev,
+ binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
+ libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaspell-dev, hspell, libbz2-dev, libcups2-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), 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), 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.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdelibs
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdelibs
+
+Package: kdelibs
+Section: libs
+Architecture: all
+Depends: kdelibs4c2a (>= ${binary: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, x11-xserver-utils, xauth,
+ launchpad-integration, sudo
+Recommends: xdg-user-dirs
+Suggests: perl-suid, ghostscript
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1)
+Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
+ kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
+ kdelibs4-dev (= 4:3.5.7.dfsg.1-5)
+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.
+ .
+ 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 (= ${binary:Version}), libart-2.0-dev (>= 2.3.17),
+ libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
+ libaspell-dev, libbz2-dev, libcups2-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libopenexr-dev (>= 1.2.2-4.1), 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), kdelibs4c2a (<< 4:3.5.8-3ubuntu2)
+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 (= ${binary: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.10.dfsg.1.orig/debian/kdelibs-data.lintian
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs-data.lintian
@@ -0,0 +1,4 @@
+#these aren't license files, just docbook snippets to point to licenses.
+kdelibs-data: extra-license-file usr/share/doc/kde/HTML/en/common/fdl-license
+kdelibs-data: extra-license-file usr/share/doc/kde/HTML/en/common/gpl-license
+kdelibs-data: extra-license-file usr/share/doc/kde/HTML/en/common/lgpl-license
--- kdelibs-3.5.10.dfsg.1.orig/debian/kdelibs4-dev.install
+++ kdelibs-3.5.10.dfsg.1/debian/kdelibs4-dev.install
@@ -0,0 +1,784 @@
+debian/tmp/usr/bin/checkXML
+debian/tmp/usr/bin/dcopidl
+debian/tmp/usr/bin/dcopidl2cpp
+debian/tmp/usr/bin/dcopidlng
+debian/tmp/usr/bin/kconfig_compiler
+debian/tmp/usr/bin/kunittestmodrunner
+debian/tmp/usr/bin/makekdewidgets
+
+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/kswitchlanguagedialog.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/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.10.dfsg.1.orig/debian/man/kconfig_compiler.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kcookiejar.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kaddprinterwizard.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kio_uiserver.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kdeinit_shutdown.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopfind.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopserver.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/ktelnetservice.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kinstalltheme.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/khotnewstuff.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/imagetops.1
+++ kdelibs-3.5.10.dfsg.1/debian/man/imagetops.1
@@ -0,0 +1,46 @@
+.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),\  
+.BR 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.10.dfsg.1.orig/debian/man/kfile.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/cupsdconf.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kdesu_stub.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kio_http_cache_cleaner.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kpac_dhcp_helper.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/cupsdoprint.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kgrantpty.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kconf_update.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/ktradertest.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kde-config.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/preparetips.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/lnusertemp.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kmailservice.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kbuildsycoca.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopquit.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kshell.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kcmshell.1
+++ kdelibs-3.5.10.dfsg.1/debian/man/kcmshell.1
@@ -0,0 +1,175 @@
+.\" 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 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.10.dfsg.1.orig/debian/man/makekdewidgets.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/meinproc.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kde-menu.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopstart.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcop.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/make_driver_db_cups.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopclient.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/ksendbugmail.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/klauncher.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/fileshareset.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kunittestmodrunner.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kdontchangethehostname.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kdeinit.1
+++ kdelibs-3.5.10.dfsg.1/debian/man/kdeinit.1
@@ -0,0 +1,50 @@
+.\" 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),\  
+.BR kdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  
+.BR 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.10.dfsg.1.orig/debian/man/kstartupconfig.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kded.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/artsmessage.sgml
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopobject.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/make_driver_db_lpr.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopserver_shutdown.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kab2kabc.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/ksvgtopng.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/kioexec.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/man/dcopref.1
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/cdbs/debian-qt-kde.mk
+++ kdelibs-3.5.10.dfsg.1/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.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.10.dfsg.1.orig/debian/cdbs/uploaders.mk
+++ kdelibs-3.5.10.dfsg.1/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
--- kdelibs-3.5.10.dfsg.1.orig/debian/cdbs/team-members
+++ kdelibs-3.5.10.dfsg.1/debian/cdbs/team-members
@@ -0,0 +1,17 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fabo@debian.org>
+Modestas Vainius <modestas@vainius.eu>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
+Raúl Sánchez Siles <rasasi78@gmail.com>
+Pino Toscano <pino@kde.org>
--- kdelibs-3.5.10.dfsg.1.orig/debian/cdbs/kde.mk
+++ kdelibs-3.5.10.dfsg.1/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_icons
+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_icons; then dh_icons -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.10.dfsg.1.orig/debian/cdbs/buildvars.mk
+++ kdelibs-3.5.10.dfsg.1/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
--- kdelibs-3.5.10.dfsg.1.orig/debian/cdbs/versions.pl
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/icons/cr16-action-suspend.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr16-action-suspend.png.uu
@@ -0,0 +1,22 @@
+begin 640 cr16-action-suspend.png.uu
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```"W4E$050XRU63NX\;51C%
+M?_>[=V;LC>WU8]^LL@L;(=$B`=HH$C140(-0_H?D[X".BB*I$!(MHDJ4C@*%
+MIT*@(""AE0)9]L%FC>U9V^/QS-S[43@"<8JC<[JC<W3,1^]W/KBRMWK36M-6
+MY5\8`^:9,,;\IP$CAJ+PH]\.SFZYO1=6;NSN[K;G_CF,<0"(`1=%1"Y!K"#&
+M(Z*(6*P51!2KAVU5O>%$3&=6K-+HO`*`B^HTE_=HM)['14T`?#5F-CVDFA]B
+MI<*()>2!)/ZE(QJ4JLK)9V=`Q>K&57IK^^1SX?SL,</!$X+&+'=?)6F\3%',
+M4=_'4*(*S@=EGOU%%&^SOO<N<7V;7W^^0Y9^3V.I)(X=\[1#L_L:S>Y5RB)G
+M?G&7FLL)JCA5I<A/2>IM&NV7>/33YV3#._1Z2W37WZ2JE%GZ)=G@&&=+EKMO
+M<#3\@8A'A*!("$J4U%G9V&<X..;\^#.:2R.$BE;O&DESG\EDAM$^^>@>1@<D
+M2R^2YU-4%5$-U)(6EYH[I(,#8O,8P@#5\6(^(P0_P6A**'_'%W^0U-8H*T$U
+MX$((6&<QQB!BB&.+2(658K$](%(BIL`*&!0%5`W!*^*]@LXH9D>T>U>(:ALX
+M)UAKP>@BI@C.&ERRADUVF$V/<7:.#P$)JAA*QH/[M):W6-EZ#R,)UDR9I0\8
+M//V.V&78**&V_#:!%<;#;VE<"GBON.`#UCJR]#[9Z!NV=J^3/HTH)W>9]C\F
+M\=!87:?6>8>X^19'3[ZF;A]22QS>^V<=6(LA8WARB^ZVT-F\CB]?A^H0(P8;
+M[Q!8Y>3/KYB//N'R9L![@_<!5_F`M4(419APQOCT0_+Q-:*E?6RT2:@@'QXP
+M&7U*8AYR>:LB<H[*!RH?<%E6#,?CK!-%%A"4%)_>(T^_0*D3U&`EIY4$DMA1
+MS(6RJ#@Y'7)Q,1NZ\_[T]H,?#V_6:E%[<5DP"^)_'M"%18$L*T;]OZ>W_P'N
+3HF#O#V#U#`````!)14Y$KD)@@@``
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr128-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/crsc-device-system.svgz.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/cr64-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/cr32-action-suspend.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr32-action-suspend.png.uu
@@ -0,0 +1,52 @@
+begin 640 cr32-action-suspend.png.uu
+MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```(,4E$0518P[67RX\<U17&
+M?^?6L]_3,V//>/S`#VSS,";$($4$<"(G_P!A#ZM$$6SS1[#*!K*(E&01*2QP
+ME(<BL@B@($&4!"L$VV`\,`;\-I[NF9[NGJ[G/5E4=<U@$U9)2:6NZKKWGG._
+M<\[WG2L_^3$-59YIU/T7VNWPF#$F!.7_=5FKT<9&='Z\F;PDPFE7E6?V[>F^
+M^.3C1Q;FYAI8:U']&@<$9/H`B-S]4;YBTM8X"6^OCAY]^V_++UZ^NH;;J'O/
+M/_'XX85[#\WSR<H--D8&Q;UK"2-@C,$8^=*O<\>[&$&D_$\$,5)\$\&8G-!/
+M>.C!)4`7_O"G]YYWV^W:0[/=.A^OW&`<'V1NZ01&"@>TVJ$@!DSY;AP78URD
+M-`**B"+8T@&#2.F(4#U#1K)Y@?7!,O-S#=KMVD.N,1+FN65C*,PN'J-67T2Q
+MVT&M%O#]#GYMGB"<Q_5:&!.@JE@;HW9,$O?(DA[H)K+-<'&#B(.1G'1T&4@P
+M1D(7!:L658.U*6DR1+%5'$4$SV_2FKF?9OL07M#%F+M#!!!F*4FRQGACA2R^
+MA&-BC)&MQ!$'R!#C8%51G09;%55+GDW(LA&H0AGS1FL_\XM/4&OL0L3YV@QW
+M7(^:NQ,_F&4\7&*]]P\"YS:N:Z:9!,1%6,M$=Q5%%50M6;:)DXY*N`SMF6,L
+M[/X^?CA;^JF,AGUN7%^FO_HIZ`3?=PC"%C/=_<SM.$00=G`<E_;,/8A3HW_S
+MKP3YY_B!"QA$8T1T:A]7%:Q5K$W)TB&N&R("[>Y1=NX^51E/DXA//GZ7Y0]?
+MHUD?,3_K$_@.QA$<<4F&Y[FY.4]WQY,T.T=QW(!6:R<V?XH;G_^>6;.*Y[FH
+M)DC!!ZA2A,!:Q6:;C`?+.(ZAWMC%PNY3!.$\`,-ACS-_?Y7UU7?9L\ME9J:.
+M,1;!EN67(Y(B;#+J_8XD^@:=^>_@!QTZ,XM$DY/<OOH*2XLI0@RB%=\85<6J
+M(@))?(OQX$/:W0=IM`Y6.__G.Z^PL?HZ]^Y7.FU![29&'&JMHP3U(U@UJ)V`
+M3L#V2<=O,1F\B;4)`',[#H-W'X/!`"$!MD)@`-1J21B*%[28F7\$,47"+5]\
+MAYM7WV#O;@?72;#Y&#2E-?LM%O8]QXZ]SY+H<4:C,:H3T`C1,?'P;>+1.11P
+M79<=BX^R-C#DV00I$2@<4+"J.$[!6)W98S0[AP'8&-SB[)E?L[0P(?!2U$[*
+MW4-SYIL8)\3U:K1G3W#SBTW0""ANFZ\R&;R&S=8`Z,[=0YS-$45]C&18+0K!
+M*(I:Q1C!]6IT9A_&<4(`+G]V!IN<9Z858^T$M1'8J""1<@R`Y]49CXL0"!.P
+M$:(Q>;Q".KE8C@EHM/8Q'`Y!"INJ6H9`+<88/"^DWMQ;+7SK^K]I-\9@!]AL
+M@-HMF+E+L)+R_ZA(-(U0.R"+/JI&-)J+C,:*D<+FMC*D8"SQ\/S9:L)DLT>]
+M5O"_D(#F1=0T@FUT#8J0EK<SU3]$+9JO%IH"!&&7)'40,>16`<4MN-P6RN68
+M4C3*##6"[YI2[0S&@!&+$<N=EV!+1TOC8A"Q7Y)K!?)<$9&R#,&H0FYM*9^6
+M+%VK)M0;\ZBZV^2VE%G'W"WZ8DK)-94L.XZ'XW:KH7&TAN<6)6_SHA0-*-9J
+M,4DRDNA:M>:NW0^39"&.85L?4.K\'1X4_<*T%Q`<`^*$.,&1:LQX>(TPM(@(
+MN;4H6B!@\U+'29D,/\#F4>'`GA,X_B$4<!SS)22VYX!B0:3H#\KO(N#Z^W'#
+M!P#(THCUW@5F6L4<:RU4"*A6\,7CBT3C2P"TV@L<N.]9)G&[:$2F70\I:72I
+M<J!W>QG/2<ONJ#!NW!F"S@\P[AP`_=XEXLT59KM!D3%;25@B((*(2YK<8+#Z
+M)K7F$<2X+.U[BN':6;+LC]1J4P<BQKW33**<P4;&RH7?L&]A&D8PQL5OGL*M
+M/09`GF=\]LE?F.WT"<,.>6ZQN9V*D6+55NV5$1CV_DQ[[MLT.H_@^S4.WO\L
+M7USQ('D#(T-$A"S^"(U^2CS,N&]_PDRG5NW<;Y[";S^-F*#DD_=9_^)U3ARO
+M8QQ#;FT9@A*!O"S#:8QMUJ-__5>X_@Z"VAX:S9WLO?=';/2/L]E_%8<K"#'&
+MF;!S3C`FP#@U'/\`0>=IW-JCE?'UM<M<>/\7[-\;TVXWJZ(MDG!*1&5M&B,X
+M)1?$HW_1O_9SNDL_)*SOP?5J='=^ET;G.,GF!TBV#'8=1'#<+DYX%#=X`'&Z
+M%9>LKUWF[+L_8[Z]S#U[6TQK1Z`,@18AR'-;&3=E5VN,$`_?HG]E2'OQ.6K-
+M!W`<CR"<)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-*N
+M5K$IMK?GD.<6M8J+%B^(5$0R-6ZD0,.1/DQ^RS!ZAW4YB)K#./XB0=#%JA)'
+MZXR&UQBM7\#HI[3K?8X<"PG#^A;L,CU)%268Y:486=4H2;(PCF)JH;=%-A4B
+M!N.`$<$W-U%[$Y4SI!.'S0U#FBJ.L71\R^*>G#!P\?T&8+:Z\>G.2R=Z_0WB
+M*,6J1FX<Y^>&P^BQU=X`$:'9K!4(B""B&)-CK%1<+T8PDN`Y$'CEH6,;6GEN
+MF41I*4B43D@E0/VU$2N7KK.^,2&.\W-NEMF7K]T8OFB5A=7>I$J6LEKN4#S9
+M_G+'M_]V;3NMJI)F.:-1S(U;HUM99E]V@=/#4<KDL[47?,\Y)B+A5R_TOSFR
+AJQ(E:7X^R_0EX/1_`$:$W<%^=''7`````$E%3D2N0F""
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr22-action-hibernate.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr22-action-hibernate.png.uu
@@ -0,0 +1,33 @@
+begin 640 cr22-action-hibernate.png.uu
+MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```$WTE$050XRXV5RV]=U17&
+M?VOO?<ZYKUS[^A';B=V0IK:K)A!0&T5U*"HTE$I,^@=TUK^AS)"0F+4SQ@QH
+M1YU5BHA0*Z'P$'$AD*@0I6WL&*R$V''LQ/?ZGG///8^]&)P;TD&16-*6]FM]
+MVGM]W](G<OJ5%SJ'%UYO3\R<04S`_PWE>X5JWGNP?>7ASIU7I?/B&Q^=.ON;
+M%55%B@21_[DH!B,"QF+$(,9@1D-$JK4((@;$4$I(TN_Q^>K%RZ[=F3GC2\]2
+MI\OR?/,QI@B($#A+LQY0"QV(4)20YN!U!&PJ8!'#E_=+/K\[1KLS<\8A$F@1
+MLS`=,=8*T=&OZY'C^%R+'\ZUZ+0"PL"@"GGA>=C/V-Q)N;U74'B+,8(QAJ.3
+MAAO;!8@$3A6\5PZ2@BC,4(79B3K/GIKBB=D6SL)PF).F&2)"&#@6INK,=2)F
+MMF,^OMEG/PVQ5DB&`(*JXE!/Z3W=N,0YRY')!B_];);YZ09QDO+>OS:XL7E`
+M/[.X(&)JO,&IXQV>/-YF<?X0D8.+G^W3RUHDF3PB$:>JI,.2M;LQC7K$\T\?
+M9GZZP9WM/?[Z]R]8NV\)6],$08@I#3OW#.M[,3>W"W[]S#@_F&US]D<)%ZX>
+MD&@;[Q55CU%55)7-G2$3[8B33[2)DY2W+ESCT]L1>7@8XP)^=7J<7YYL4A8Y
+M^PFLKA>\?34FS3RGCD\RUTKI#W)4054QJ`=CJ-<"SIV<PEG#/U;_R^JMDMRV
+MZ2:>(Q,1+SX]SOG38XS;?;I)29S!/]<R/KDU)`P#GCS6I-OM4VI58^-546!N
+MLLG2?(MTF/'.QW?9S<;H#93>0#'&$-B*.-&<WL#3'PI[L7)Y+2,KX.AT$\H!
+MA5?4>YRJ!X2)=L18,R`9#+G]H"0M0Q@H8BK=ZJ@#LP+B3"B,`,)7NR5I[CG4
+M"&D$!>15:9UZCR`8Z[YM#FM#K'.H&+Q6XU%XA,(;K!>0QV<"H+ZJL?<8]1X1
+MZ*=*+REIU$,69AH(8*S#6(L84R4B&!&,-1AC$;',=1RUP-!+,N+,(`)>2XSW
+M'A%A]\!S:SNE%H6<?V:66N`QQF*-I52A5/#>4Y3Z+6@M-*PLAH0.-K[NTLOK
+M"*!>*[D)D)?">]=[9(7GI;,+/+<<5F5QCO5[)=<V$CZYL<7Z3HES(8AP;BGD
+M%\L!PRSG_2]V(9I`4;QZ;.W$RZ^-31[!!0$[/<^)V8BEHTT6YVKTDH*MGF%_
+M('RZD?+AOQ-Z.DVS4>>Y'X?\;J7&9,OPX;7;_.UJ0=B>)QW$;&_^!Z=:C@AS
+M]#-X\]V'3+<#?K)PB#_\ML;[-V)6UTNV>@9CFAR=<*PL!IQ;#&A&PO7U>_SY
+MTGUH+6.L174D-^\]`,9:C+%\>;_DCQ<>\/OGVYQ=;/#R3\<X_Q2DA2((M0!"
+M)PRSG$N?;?&72[OLF1.$M29(U1S^,;!B1^P;Z_AJ3_G3Q0-^?B+AV>608U,!
+MA^H6@.UNQL;6`1]<W^?JG0#?6"(,ZXA4BE'U>"UQOBSR/!L&8@S6!J.7&P:%
+MY=*:<'FC8*(^I!65X`OZ0]A/`[P[1C#6P!FIW&0$FO2[^++,79;&5Q[LW%E1
+M((KJE6;ED2M4"??$`-6\LJ8,B$<V5NT##)(#[F[>)$OC*\+I5UX(:LW7@[!Q
+F!N$[S/3[>JGFQ7!P)1_&KWX#>T1.!<^X[8@`````245.1*Y"8((`
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/aboutkde-kubuntu.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/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.10.dfsg.1.orig/debian/icons/cr32-action-hibernate.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr32-action-hibernate.png.uu
@@ -0,0 +1,53 @@
+begin 640 cr32-action-hibernate.png.uu
+MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```(84E$0518PZ67RV\;UQ7&
+M?^?.<(8415(/6K*4^"6_$C^3V`8*-(G1.&V!+M/LDU6[2+;]([+J)NFB0-L`
+M!=I%':0M4K=`'FW0>)%'X\1V:D>.[49^2+(MBA1)#>=U3Q<S&DFNFTTN.!QR
+M'N=^]SOG?M^]PI&?55%]WJM47RY7ZX>,,67E6[;_%T!`K1T,^BL7HZ#_*B*G
+M752?'YW<_LJ^HT]-5AOC6&M1_08(DGW)Q@NRX=;&7YM.LO8I]]IWC\]^_L$K
+MRXMSN*5*]:6]1Y^<;#ZTA_D;7V'B%5SS``!B,,8@)C\7_QV,;+PNB$CQ;/8_
+M>SY50T29Z9G#*$R>^^>?7G(KU?KAH=H8\W-7F!GI<VSO.*YK-G"9CU8$Q`""
+MZQA<UV",(!@44`2K@AC!Y"`D?T=$$(3$PJ5;$;/WVE0;32I#]<.NB"E;FR+Q
+M"H=VC;%UO(*U&QC8$*Q1]6@V/)IUGUK%Q2\95)4PL?1#9:D3L=1+6(WR-&T"
+M(CA&2-4PMQP3*8@Q91?`6HL1)4XLW=48J[J>.1&&*R4>W5YC]_0PH\,E7,?P
+MH!9/EEGN15R=[W/M3D*8.CG]63C'0&+!<015BZ*X`*I@K1*$*;T@8:U_(X:=
+M4U6>/-AD:KR"8X1O:J62P\1HA;&ZQ_18GP\OM[D;^!CCYO$@3#)VUCAV-<^@
+M564U3.@-'"#+XZ&9.M]_8I*QFI=5A"JM=H_9Z_-<O]TBB,!Q/6I5GYW3(^Q^
+M>)S&L(_K..S86J?B"?\XW^+KMH];\G(`@B+9J!5<5%%K,_J#A++G`L+^[75.
+M/391=#X(8SX^_Q5GSL[22X?QAILXKH\8@]MVN'@GHOG5`D\='&7_MF'\DL/$
+M6(VG#UG^>':>>X,QW%*)*,[H5;6`9B6L:ED-+;,W^RQU8SS/Y=3CDS0;/@!+
+M[2ZOO_D!KY^Y3$NG<>O;L>XP,1ZQ>H2V1#]VF6N[O/EQC[_]JT6G'P&PM=G@
+MY.%1HNY=@@C"-&-@36^,HCD:8;$=\>^Y/@=WU)F9JA8C__U;'_'.YRMH?0_B
+M-5B-%,<8]C]48=^4C\$2A$H00:L/[U^.>>]B0)18`/9N'^>1*>AT.D2I9#66
+MBYT!4*N($50,M:$2C^\9*0KN[*>SO'MN`:>^C<BZ]"-+G,)W]M=X\9E)7GAF
+M"T>F(_K]'D&L#&+H1\('LR$7YD)`<5V7X_NW8*)E@C`M&,@`*"@6,=F4.;2K
+MP=Z'A@%87%KAMW\Y3U":)L8GB)354`'#$S/#E#U#Q7<YMJ?.:F>!00R#)#ON
+M=2UG/@M8[F<=[9@>9;P2TEH9D%@#6"A28!61+-C170W*G@/`)Q?GN'C+$IH1
+M@M`RR$<8I5#VUK5@J%PB6.T31!#$PB#*JOWJG90OYV,`?*_$]HDJW6XWFW=6
+M431+@57%&$/9+[%M8J@(_-GL(GVMTPF@LYJI71!E(#;YE6:@!G%VA(DPB*&S
+MJER^G12/;1VOHG$/Q&1BMS8-L18QAI(+8[52\<+22@#N$"!$J9`"QL`@43:J
+MM0)Q*L2)X&CN>I)YP[VN%IXR6O-Q-,*(H#9%`5=5L=;F[I;K=F$#!N-XF-SI
+MP&`U.^YO5@7R0W(ALQF2352I33-P-JL!%Q1K4XPQ6(3EWCIES9$A7$<W6.NZ
+M[7*?*AL!O<^22\9AM.H4OK+<#5%3`A'4YD*D"FHM1@Q)*MQ:BHJ@1_=-4381
+MB%/XO\F]7>Y'L'8]]W_$H>P)^Z:<XI%;=_M84T80K$TS(<H8L(@18BM\<2-@
+M$&=3Y]BC4^R><#*DQEEGPIA--6!5$2%/808$A)U-EP/3;B9H4<*EK]O@C8"P
+MK@.:2_':"+^\'7)M80#`Y'B-%WZXBWHIR-8%.<5Q*ER[$Q<`9N>6B+6$Y$R!
+M,%(U_/B$S_AP5B_7;K:XNA#B5\<0LCY56:L!BXC@&F%^.>:]\QWV35=P'>'I
+MQZ8Y?[W+GR\DB%0PQC!(A-,?]DFC@&30X7=O7T4KV_-"S59,IPYXG-B5C3Y)
+M4M[^Z#^TTC$:7AEK4VR:U8";S4);T`>&OY[K\MU'ZSP^4Z7B>[SP@QE*_AW>
+MG85NF.7Y\GS"S^\J21`2Z2-4&B/%R$\=]'CNN(=?RNKD\RN+O/-9FZ'FL:S8
+M;9J;$>NSH%ADBF&I9_G-WUMLJ;L\W/29&*ORTQ]MX\CN%?[PX2HWEAW"5`@2
+M@_@3^(ZAXAEV;7%X[H3/\9UNT?G<0IM?O76)L+*3X:%Z/KW!VC1C8&T]($6.
+M'42$3Z^'_/*=%C]Y=I2'FV4JOLOW#H]R9$>5+VY&S"X*[:PT&*TZ[)]R.##M
+M,EI=UY*YA3:_>.,\LYTFM:T[LIF3K\_6[-A5V,"`LRY(QO#^Y9#NH,6+)^L<
+MV%:AY#HT&SXG&SXG#ZYI(-PO"G&2<O[*(K\^\R6SG2W4)G=CG$P/I`"09D*D
+M:C,`1M9%Q*R#.3>GW'RSS;,'>YP\,,3.B0IEO_3`C@=AS-5;R[SWR0W>O=!G
+M4-Y%;7(:R8MS?86<#3I;E&K.0"Z]&1"G4#XC0BMP>.-3.'NERTRSS=ZFLG7$
+M8;3FHUC:*R&W[O6X=*/']25#*ZI3'M_'D%?.!6L]+9*KH$V3S(Q4[2")HW(8
+MAI3\RB;9S90OWUP8PT+?8Z&G?')#<23&Z"J:QE@<K#1(S5;<H3+5>K8`+;9Q
+MQ?X@8VJEO40<A:C:@9O&X85!OWNBT[Z'B%"I#A<,J!5266."0FHC-2`E1'S$
+MD4)^C0@V38EML*'@*`!8:^EU6MR^<96@UR:-PPNN39/7NJU;KZ!V,NC<*XJ%
+M!VP!-NF__._=![7-7@AI$A,&/7K+\XLV35YS@=-QT&4Y"EYV7.^0B)0?%.A;
+D;]F+0#I(D^BBILFKP.G_`B`U"(\5I"I[`````$E%3D2N0F""
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr48-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/launchpad.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/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
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr48-action-suspend.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr48-action-suspend.png.uu
@@ -0,0 +1,75 @@
+begin 640 cr48-action-suspend.png.uu
+MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U@D3"P(:A`Z[
+MBP``##!)1$%4:-[5FFML'-=UQW]W9O8Q^^!CEV]*M"B*E&75-JTXL@4[JEO'
+M<547,.(@#I*T']NTS9>V*.(/@9$628,$11]HX01MG31HBCAV$Z1U@B`Q"L-.
+M',F6G82*(ULF]2`MD10IOLE]S,[<>_MA9F=W.$M*3;^H`PQV=W;OF?^YY_4_
+M9U9HK0%XXI-B#'@2.`J,`H*;Z]#`%'`:^.P7G]*3`$)KS1.?%+\'_%,VD[)'
+M#_325<QQ,QY+RUM,G5^@5'8JP">^^)3^NOC4'S,&3(R.]-H?>_Q>,IDD-_-1
+M+M?XQG.O,G5AH0*,6\"3V4S*_NB'[\&V$VQME7G[W&66EC=P77E=@:8I$$)@
+M&`9"B/"S:0K`P#0$PA#^:]/OA/"O"R$0-*X;!B`,#`&&`4((+,LB8R<I%O/8
+M=H*/?O@>_N8??FB7RLZ3%G#TP$A/"/Y'K_P2J03MA=M))CMV!2\,@2&(`#(,
+M`X%&"!,A=!1P'2!&"`[8X5JP#HV2&Y0KYW'F5QCH+V#;"0Z,]'#FS<M'+6"T
+MJYA#:\VY=ZX@E>#074^02+;O##RXB0]*`P%H0X`F5";\#1I$73$1D[&C3*'#
+M:TINL3;_-&MK98K%?#U.1ZWF;+.TO$%;QVV89@HEJ[LKT`1("($&$E8[=G80
+MT\IBFC:F9:.4PG/+:.V`+N,Z\TBO%"05`P(9.E#<3XHB=LTPTZ0R([BU\Q$H
+M%H#6&J7!=25MR3Q2.KN"K^^J%@:)1):VSE\CD]^WJ]6:CZW-)<I;T^!=!%V#
+M8*<)K(`0D?=U)4PKBZP)E/8Q`UB-+*L`4,I#>DX+X'6S^B8VS12%[KMI+]Z)
+M$.;_*I/D\EWD\EUXWCA79EXE*29))@EW'*W1@5M"PQ*@,$0#:T2!ND9:2Y2J
+M[KCS:$VF;93^H1.8EOU_2HF69;%OY'ZJU7'.O_V?]!0V,/Q(#N*F&;R_<;XU
+M="C#B)4[+9&>$YY*5E&RAI(UM'+H[+F'P>$/WA!XK77D9CL=Z72.P^,?9WYY
+MD&JU[+N5]M#*!>T%GVL()(@HY$8,!%91LH;T*F&:#'<>0?_08W1T'=D1R,+5
+M2TR>>Y7IBQ,HN86@@FTGR&3:,!/M=/<<8FCX;KI[;FEIX3N//,K4N1]367V)
+M8J<=@/6M[N<:WX64VA8#S1=\96H(H=&R45RZ!]^_(_B-]26^__S?LS!_EK'1
+M'NXXU$9[>]%/J>$F2`1OLG[UYRQ<V</^@X^3R19BLD9O?1^OG9S#-,[2T9[Q
+M@==="1FZ4'W#C3IHJ7P%*J7+>.Z&[S+:02N'?/LHO7L>;@G^%S]_@:>__`<H
+M]SP/_<8P8R,=Y',"K1S`-[U6CO^J7=(IZ,S-LCK[%'/OGFPI\^BQQ[EX.4?-
+M*8?N@ZX!"B$$4C5<,U1`*QFXT!8KBR>1LH16+H9AL/?`Q\-"T^`D&SS[[Y_F
+MOW_PMQRYHX.[[^HC84FT<M#*;9S:C2C1\.<2PODN,Y/_0K6R$7.G^Q[X(U[[
+MZ3S@^1M!#2&D[U%*1A4`4+K!/90LLWKM-;S:"KU['\9*Q-GI\]_^/"N+;_#@
+M\4'Z>I+ACFO=_(I?+[2OB*^<$RJDM4-*O$UI^3]B\FT[SYY]'V!ZYFH8U&C?
+M`JHI+S190&_C(`Y.=8&>@??'A$_\[/M<G'J%(^-=)!.J"520-8"N@<<8.O0Y
+M!L<^BYDY@90RV$TO5%+@*^95)RBMG8K=Y\[W/,K410<IW<`"09QN=R$_D%6,
+M40Z-_BZ&F=P6L(O\\+M_S:&Q/+F,BNQX_<QWOI?V[@<Q+1LKD6'O_A-<FAMF
+M:6D-=#7B5@+_?6GY6=S:ZK8ZD63DX,-,G9\/8\`T!$JIN`64]JEQ';P0@NZ!
+MAV*[\E_?^DNR&8>1?7:PX[7PM7ZV%8_'UAV^XQ&F+EP#/!\T'D*X@?(NZ"U*
+MU_XUMF[_Z/U<FEE&X""H((2.4`DC3*-*1VAOKNT`V?QP1-C\[%DN3KW(7;?G
+MP\#2.@#1Y-]6,IX>\VW=S,ZM^R11UQ`X,2NXE3.XU9G(NL["7A0%MC;G@"H(
+M`ZU:I%&E5*0Y*?:]+P;BK3=_0#Y3(66M^J[0G%E"_W9WJ<P2K=U@Y[U`D:CU
+M:J73L75#^\:9G5L/-U<I%;6`$!H=T%K#\+LH.SL8$W1A\F4&^I(8HH9TE]%J
+M$Z6B*5+@[$(:O"C@0.GF5.F6?]K">OVLK-;\+DT08-U6B94,@AB_&4FF>F*"
+M-M?GN:4OT>@!E.-G'3.!UB9"&&@M(FPQDM^1`7@#(8)[X3=!/E70*'<NMBZ;
+MZZ9<46$M4E*%+A3I!YIC(&7WQHA9J;2,G<ZU:!$]!!YH\SK3&#]P19WC!#RG
+MWA<+!%HMH[6.%,YLOI=*M4'D8OU`&`.&0#<UV*V.C&TT@6]PI7J?8!B[CY.$
+MT"'/;^[H_"Z/UO?54'6"7B!(^3$JH92*Q(#K+,3*>[ZM&T^R`_C=%8_T%,'4
+M83MXTQ"85F><MI0622:,G8-8*9!2A^"%$-2<I9;!Y#AZ5_#-DX76Q\[@A1"8
+MB>[8BM+6-7)9*[2RE-O3*`T+U"<*KC,?$W3@X'&V2FI7\"UZI(@%FM=M!X\`
+MRXY3]JV-.3(9*P@OP[<`S2ZDFA0(AE`;RW&J>^OAWV)AR=T5O&%PG1B()H!F
+M\$(($IECL36S[YZBHST9C0&U0PS4!;K5&:JEZ8B@OH';R+3=BY0^\%;@#<,`
+M6J51%0._/7@3]EV8J9'(JK65:=;79M@[8#=F1-MCH!X'S3<00K"Q_%(,QF]_
+M\`N<GZ;EI*VN4*UR+K;NZMPO?:YEQ-W(EY,A7?R3V+KI"R^1L2VZBLE&'5`M
+MZ'0D!H)S9?Y;L1%+6WL?^P]_RJ^,`7C3;'(E`>65Y^.=V\^^R=Y!.T(6Z[MO
+M"$@7_A##ZHI6#:_&6V>^R=">3-/D3K=.HU+*2!-O&`9>;9&5^>=B8.XX\AC7
+M-M^#E%'V6L\NM=(;7)WZ<Z8OO,3%J1?YSC._S]4K)[EU--<2O&4?)9%[,':?
+MLQ//4*TL<OMM[?5A+&`@I6S14NKF]-C(N2MS7\.MK<>$_^:)S[.T.1X#'XX=
+MO3.DG+]B[<I?,%`\QX=^IY^>KG0+\/>V=)UJ98V)TT]S^&`[V8P95F$A=&1<
+MT[*0-?NW5B46+WTN-M_)9`L<>_`?D?:?(I7=LDA9IL'0G@RC^[,D$F84O)$C
+M7?PS[)XG$69[C+:\_,)GL,RJO_L!>)_(F2T*F0:I=&07ZX%F&`;E]9,LSOQS
+MR[0X//8H72-?9;-V9[S";A^_A[G^*-F!+[=T&X`W3GV)N7=?X8'[>T@DS1!\
+MW0)2Z;`OML(Z(%5+\/5KI>6OLYP:HMA_HL6LLX^#1_Z.M95)9.4G&-X$J"6T
+M7/7E6`7,1#>6?81$]C[,Y/".=6+RK>]QYO6O</Q8%SW=Z6W@??*G9*,.6'$7
+MHJ4K@<'6PA>HE&88'/E$2[K041@#QM@^;]V=6C1^^\:I+W'F]:]P]$B!X7WY
+M./C@<[,+674JX=7[`4%+\/5LH\O/<N7<);J'/TTZW7;=JGLC1[6RQLLO?(:%
+MV9_PT`.]#/1G6H*O3^4\V:`2%A"0(Q7087-'\&&VD:^S./DQ'/,C#!_\");U
+MJST8]+P:9R>>8>+TTQ0[)8]\H)^VMN2.X)LKL93;7$A*W?)95JL\+X0@83FD
+MQ+\Q\^;W<,U'Z-WSZW06;KDAX&LKTTQ?>)&WSCQ'PESE^+$">P;2D6RS$_@Z
+MUI8-C=8W!KXYV[1EUQ#B&RQ?^!I3$WT8J7&L9!_97#?9?"]HG\^7MJZQN3'+
+M[,PIE#?'WD&;^]Z;I;^W/Y1Y/?#@/T7:'@-::RT\3U%U:J12]@V!]Q^'-KXO
+M%E)T%=<0XF4J54FY[+&ZHBE7%*#(9A/L*5C<NM>B+3\8C9$;!`^PLK*!YX4*
+M:`N8*I7=,:44UZZMTI9+8R5N!+P1^[Z>Y[,9DUS6BM6%>O7]5<&[GN3M=RZC
+ME*)4=@&F+.#TZFIEK%;S4$IQX=(\?;T%<KDTB83I3QG"J8(*^G"!0*$U2!%D
+M+M&((25$\)Q.HD+%_>]E"$K[-!H_><BFQZJ^4CI4RG4ERRN;G'OG7<KE*IZG
+M6%VM`)P._VK0T9ZVQPX4L$SCIOZK@2<5D^=76%NO5H#QR)\]+-.P.SK2I%/6
+H30F^ZGBLK57QI&K\V>/_^]]M_@<(B5E4DA'"T@````!)14Y$KD)@@@``
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr16-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/cr22-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/icons/cr16-action-hibernate.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr16-action-hibernate.png.uu
@@ -0,0 +1,22 @@
+begin 640 cr16-action-hibernate.png.uu
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```"]4E$050XRSV3RV]491C&
+M?^_W?>><&3LSG:$W6YH60D$!$P.)FE:\+'2E;HSA?X#_PYTK%[`R)FZ-*Y"%
+MT453\9**@5"!6D*D-V@Z=CK.Y9PYE^]UT99G^23/F_?)DY\T/OCR\['IN:LB
+MM@[*"XD`@@@(`B+(H2\B%%FZO[.Q>LV-'C]UY<3LB?KQV@!GY3!M"`)'%`88
+M:RC4H!BL,1AK40SK+5M7](H3,8VQ<LP;<Q4`RI'CU%25DY,5JF4'0"<N6-^-
+M66_FY&JQ1O!X_G)1PZ@J29JSTTK(/2R<'V/^W`C&)SS9V.7I=HO0>MX\,\S%
+MDQ&#04JSJV2%`(I37_"\-6!Z).#3=R:8'@FYL?B`W]?Z9*:"<R&-ZH"W7JFR
+M\&J59)!Q\^Z`)"^AWN-4E6>ME'HEXNQ,A>]^7.'&GWU>JHWPX85C:)&S^#!F
+M:[E/YAWOGQOFC\>;K#P+4/4854\Y"I@_/\K63HMO;^^RGU?)O>'2V1KSIR/B
+M7I=F5[AU+V&O)YR9C.C%":J*\UZI54K,3@RQMO&<)WLAI2$HEQ01P1BAFWAZ
+M5NAGGG^:!>/U"*-MO%><]QYK+"*"&(-U(3F&U%LX6)Y,#:DWX"V*@"J"'E4H
+MB#/8;*;,3==YN1%@C,-:BP*JBA&#&,?XL&-VQ++U;\R@<'A?8-1[LD)8>M!A
+M:JS&9PNC1('02RW+CV-^>[A'OPB)`LO'%TJ,#GE^?=3!NPI:%`<5G+,L/>KS
+MRVJ?R^].$41M;M[+^&JQ!SYB8KS")Q=+?/1ZR.W[F]S9+N/"$H4_/&"MI9\*
+MUWYH8<PQ+K_=X+W7"M;W0$28';6,#7E^OK_-UTL#?&D&\07^X(,<8RQ!&+#3
+M$;[XOL.EM83YTP&3=0OJ67N:\,W?7>YL1.31#,X%^$&.]SDNC?NM?J_3L$&`
+M46CWE%MW"WY:22B'BJ@G*2S>U'!!A$E3\BRCM;M-W/VOY7KMW>OKJ\M7@[!4
+K/T#X"%]>S"AR1*D>>DJ:]/=[[>;U_P'29FB.5=SSF@````!)14Y$KD)@@@``
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr22-action-suspend.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr22-action-suspend.png.uu
@@ -0,0 +1,32 @@
+begin 640 cr22-action-suspend.png.uu
+MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`````
+M``#Y0[M_````"7!(67,```L3```+$P$`FIP8```$KTE$050XRXV5SX]<1Q''
+M/]7=K]_\>#NSN_;N>KW>&(/B2.`<K8AU^&T($O\"-RZ(.]Q\BL(!;IPY`"?.
+MB`C!Q0E2;+!1+`5D"=MQ'&77F]AK[\[LO)DW[T=5#F^R<``I=>E6=7=5=7^_
+MWVKYV4_DV]M;*Z]O;`PN.R'A?YCQ^<R4ZN,GX]N[>X?7Y%=OK+SS_:N7=LR,
+MZ4P`:7<).`%Q#N_`.8=SLA@=(H)S@LAG?HBA87P\Y<T_OW<C;*P/+JLJH]E%
+M^H.73K*+""+@?4(2^X30002@!BT0T3:P<[A%DJ;\@.'@/3;6!I>#"$D^-=+>
+M-C$=GEP\A"[9\`+9TA=)TA6<CV"&:D4Y/Z28?D@]_PCOZD5PAY,MZOPNXD@"
+M9I@I=75,.4\!H]L[P^G-5\F6O@`2J*HY95$@(@0?Z?:W2;N;Y.,-)D=_)X8C
+MQ'NP*2)@9@0U4&UHRA'>!WK96<YLOT8O.T<QRWGX_EL<'][%NPEI#/2RTZR<
+MNL1@]666EE\$23EZ\B99=XS8M`71()@:35V0%_=)TQ[K6]^BEYWCV<$N_[SS
+M>[S=9VTU$M.D!<Z>D#]_0#V_Q_+:]Q@LO\!T^@K'HS\PZ$\Q4U0-9V88QGSV
+M(6EWE<'*5RB*G#NW?D/*/UA?K4BB8WGM._27OTE5-:!'U/E-\N=_1+7@U-HE
+MBFJ3JIP`AIGAU%I:);'+Z3-7<"[P[[M_H9G=9)!5:#TB[9YE>?V[#->N<C19
+MIJE'0$Z9_XWY\2V2)-(?O,QD,D*DP=1PI@IB]+--LN%%RK+@\:,_,<P.,!UC
+M.E[P-B&$2%4)VHP1FV#-,\K)#;"2_F"+60&F-=J"9PB0=E9)XI#Y?$I3?40,
+M!=8`7L"*]HH`E(CE"#4"--4C5`MBND3=]#`#4R.H6DNCX$[$$1-/\![G#">*
+M$_V/<%"<U`@>)_S7FJ#:-@!5PZD:B&`ZH:G'Q-BCM[0-BV3>MY(%06`AX=;O
+MO1#239SK4,['.,D!H5'%J2J"H/4!1?X^,>UPYMQ5U#J+PQZ1!FA05<SJDZ#.
+M=XC]'9#(Z/`AW3A>%&DX4UM44S$^>`O5DNT+KQ&SKR^D[6GF#YB.[K"_>XNF
+M?$",`1&(V162_M>HJCD'^V^SNM*J3DT):@H"W@>FHW>8'-YD<.H;;+_X8X[V
+M(U+>P.H]1H]_SBQO.'\V)XD927^'SO(/$==C[^%U(N\R'*8\?5J@:H1&#:RM
+M#)MP^/C7)'&-I>&7Z?1^2G[X-LWL)L[VZ6>.$+=(^CLD_2N(Z_/)_K]XNOM;
+M7KH`WKFV8C6"-BVJ[;LYFO(#GN_^@L'&C^@-7V&X_@/0JY@5+7RN@TBDJN;L
+M/[K.P>[O^-(+S^CWXDD#4E6"JF*`]Q[G6B98_8CC_5\R'7V5F+U*DI['AZ66
+MQ?./.1X_Y.C)7TEXEXL7E&XG+OJW0]5H5`EUH]5\7B7."4GB\>XS.LV0^CKU
+MX0WFMDIC&74-V(3$'W%^7>GU$D3"(JB@9HQ&4YI:JY#GY>W=O><[F-'MIHOO
+M1D[&=O[)@L."\XY2'/FD%85(ZP<XGLRX=_\Q^;2\'29Y=>W>@V>O[^Z-+_-_
+C/M//:V96S6;U[7Q:7?L4LF9'88KQ:!8`````245.1*Y"8((`
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr48-action-hibernate.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/icons/cr48-action-hibernate.png.uu
@@ -0,0 +1,74 @@
+begin 640 cr48-action-hibernate.png.uu
+MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U@D3"C,[#_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`J<
+M_-EWF+HZ4@1V6L!3L40J<=?!QXC$$A3R.:Z.OL-2=A;IV#?<4!@F0@@,PT`(
+MX?\M#!-#U/XOQ(K[5DQO'6%@"$`8(-PUR[*(QI-DFMN)Q!+<=?`QCCS_E42Y
+MF'_*`O9V]6WQP;]U^E<(+=D^T$Q+.KHV^.H7K@2B$9B&0!,&7`]0".%I(;3F
+M/:>U8*FHN'B]P/Q,F;;.=41B";KZMG#UXIF]%C"8;NE`:\VU2^<16O+D[]].
+M<RJR-O#J52,P!&A$8/UF[EGM6G^_MY8K*9[]199"+DNFN=V+TT&KGFV6LK-L
+MO:6)6-2D9*LU!:@'Y'ZYICD5H:\]02INDHB9)*(F2BD*98>RK2E48'+!)E^2
+M:*CN@?]\[1I>BT<,-O?$N#@=<&MA`6BM02ND8Y-)-E&NR#7!U[2D224B?&!C
+M$QN[DVM:K7[,+N08FRHP.@L5QQ7"W;MV#7YVA4C%3002M,*C?\O;5%5W<:2B
+M;,L&).QJW0,?BYCLN;6-'9N:,8W?+&5TM*;I:$VSTW$X>?8:%V:C8$1]C;O6
+MT54+XZ\K[<:)AS4@@">15)I21:VA>1CL2W+H@[TD8N;_BA(MR^)#NS:RLU#B
+M!\<NLB2ZJL$+6@?!U]:$CQ7`6+FIE)JR+?U9LA45QYUE1W/7;:U\;%_?38'7
+M6@>^;+613L9Y_,%M]$4G*11*5!QP%-A2XRBH2'=*[7I!0`GU,0!0<13%L@QH
+MW=/`(_?VLGM+RZI`+EV=XN0;%QA^9XQ<25&T!9%H@J9,DN:DR>T#G>S9MH%;
+M^CH;6OCA`SOX]>D1CKY;))%IK[JL%^CX+A2.@;H%K3451_E!ZG'WP5V=JX*?
+MG5_B'Y_[">?>FZ)K_1!-[7?0GFH.*$$*P=EYP1N_6&1]TQ2?^-U-M#6'L_Z]
+M=PXR,?4JY^9-DIF6NH#62%7G0E6%&[ZIE:OUJS-%E@H.%5M1MC5E6S/8E^&!
+M/=T-P?_T^)O\\5\]R\4IQ<".^VGI'4)$,Y0=[9O>^VQ+#5:<\6(K_WQD@1-G
+M)QKN^8E#>TE71BD4*U0<_*ETE424]!7N"R"KH9TK*4Z\/4^^)+&EQC`,'C_0
+M7\N:7L[(%?C<5U[@[Y_[.2T;=M.S>0^2"&5;8SO!67&@;.L`F'Q%\*,W!?_Z
+MGY=9RI5"[O2GC^YC<N354`QX1!,0P',C+Y47RHI7WUU@?MGA@3W=I!-62$M?
+M_/H/.75AGKYM]Q'-]/A:KK]Z]&M+C2VU;U%/H+*M>6<ZQK^_F@_MGTDE^,C>
+M]5P?'W.#6M8LX+E/T(4\B:HU2-D13&7+'-S=%=K\)T>'.?[&*!T;=Z-$U`=E
+M.QJGFD(>N:>#+SR^@:<?Z^/0=A,I)8YRV<5W*>4*-WS%X95WPT(\?&`'Y;D1
+M;$=2D2Z-AO#ZB4RI4$7Y!_=M(&H%F79Z;HF_^^81,CVWHZQT0./>_.!@AOON
+M:"81,TG&+0[=U<]`]!+9^5E*-@&WLJ6@XL`+)_,LY(+5;S1B\<#=FYF\,E(7
+M`VYY$K(`*!>X7_X*[M\=IKN_^>IARJ1(M&_V@7A7;^[?VA1Z[J']VY@9'W'Y
+M70G_Z@5WK@S_=BQLA0_MWL3<Y"7*CJ!HBVJ!IU98H$JC];R_95V:@9Y48+-S
+M%R=YZ?51,GV[_,"R9=4"=?[=E@G'3&=;AL79<4H5Y6K?$2$KG+EB<WDF:(7^
+MGE;:DHJ)V1PENUH`-J)1I52@.;GW`^TA$/]U_&V*9%@HQRC906;Q_-N6JV=>
+MJ=Q@]BQ0<?#!>_.UT4KHN9VW;V!Q=MQ7KE(K+*`1O@4,PT`8)GT=B=!&QTZ]
+M1[1I'15I,+<L62ZY2:]>D+*S>F'G"BA"0M=3Y>E+X2ZPMR-#)3_O=VE::[]7
+M\#-Q((B%H*LEW(U-SBX32=_BWU.V7=:)1,`T-(8A$$('JL6@!5R?-S35>^L;
+M'+=DF,B&"\G.UA3*+OCW*J5\%PK40O4QT-T2"Q5F<]D\Z=9$J$5T)#A*8!JU
+M.GXM"Q@(A*ZO<VK[S>6T[PW>Z&Y/(>UBK9!;60OY,2!,A-"U!KO!,"+)AHVX
+MUR<(8=S@<*=Z'\&.;F5KN7(HN^2Z4-4"H5+"%<`#93*U:(?2>V=;!K33$'Q@
+M[0;=7'T#'P1OTIHR0WM,SQ<PK.CJ08Q6:"5]\$((9A<K#8-).^6UP8NUA5@+
+MO!""SJ9PGS&SD,>*I7TK:R57H=&Z32<7PFRP?\\65"6W)OBUNLM&QS#UX`%V
+M;PSGD(G9'%8TZ2M@31?R2HD3YY="&SVX[S;LW-3:X&\0`T'P1@"\$()[MH0/
+M!EXY.TXTV7)S,>`EL\LS-F/3P3)WZ^8>[AY*(K3K;HW`&X:!:G`BXU620?#!
+MX-VU,<+FKJ`+C4UDN3RY2**UW[\O'`/5.%AYW'?TK;`5OO3IC\+2Q88G;9Y`
+MYR?"\?/6Q>M^K54/WIO)F,%G/A(//7?T]!A6+$DTW5&+K4;E],H8$$+PXHGY
+MT!%+3T<3G_V]37YF],X_ZZWQP].%$)#GC[Q)HK7?=YEZ[2,,_N1`G(Y,T/TJ
+MML/S/WN;9-L&_UZ-:.Q"4LK0&>?THL/W7IX/@7GDX!W<V36#T#)0O7JQ<>I2
+MA;_\UG6.GA[CI=='^=33_\&)L]=)=]_6$/S>31;W;0W[_G>/G&-ZH41SWW8_
+M@`T!4C9H*;6N);#ZDN*Y7\ZSF`\STA?_[``[.V=#X#V>/S,N^-LC,?[Z^UG.
+M+ZVC=]?'B6>Z0N#OWFSQF0?"KI-=+O'LX6&:UVW#C*9\=O/JMALDLAJH?%GS
+MA>]/A\YWVIJ3_-.G[^'/#T@2EFR8I`S3(MFV@53G(*89"8!/QPW^XL$X3SV<
+MH#DA0F7+YY\Y1DE:-/=MKU&S,#"%7CV1U6O1!V$8G'BWP#,_G6Y(BP_?.\`W
+MG^A@1_?R*DDJS/M[-UE\_8]2#=T&X&LOGN+XF0FZ;OTPIA7QP?L6J$MD5J,@
+MK@?OK7W[>)X-'7,<NC/<)_2TI_F'3]W*A:M97AZ1#%\SF,W!0L$MRMI2!IU-
+M)KLW6NP;C##0N?JIWH]_?8%O'#Y#Q^!^XIFN`'CW3"B8!T("-`+OL<V7?I3C
+M\E21)P[U-2P7AOI;&.H/NL):!=I*M_G:BZ?XQN$SM`WL)=,Y$`+O_;V*``Z&
+MX=;#C<![;//"*<VEV6M\[I%.FM+Q&[_!N8F172[Q^6>.\?+9*;JWWD^R95U#
+M\-ZIG%+.2@&D*Q4"<PWPWMKK5P2?_.HTC^XJ\^B!`:(1Z[=[86<[?/?(.9X]
+M/(R,MM.[_2&BB:95P0<SL0Q:0"O9\%U6(YX70E!6$;[UWS%^_-9E'MIF\SL[
+MNKFEM_6F@(]-9'GIU!C?^_G;+!0CM&W<3[QE?8!M5GW]5,7:.`;0-P6^GFVR
+M3A/?>5/PW,DY>F(C[.PWZ&FQZ&Q-T=V>\NOYF84\XS/+O')VG(FL(M':3ZIG
+M'[U-O;4];P`>0#IV*`:TUEHHZ5`IETA$8C<%WJ5'?*J,I=K)B@Z.30GDM2).
+MI8"V%U!V`:4A$DMAQ=9C]=Y&WT!3`-3-@@=86IQ'23\&M`6,V*7\D%**A?D9
+MXJDFA&G=$+P;[XUYWHRFL&+I4%YH!/(W`2\=FZNC[Z"4PB[E`48LX+5B;F'(
+ML2LHI9B\^AYM'3W$DVE,*X*@EH$5;A<NA$8IMZLU#`D(M*X3!`4(I!8(H=S#
+M**]3T]+G<P#EOS"4_E&)]_;2$THZ-LN+<UP9/4^I6$!)AV)N`>`U_Z<&\51+
+MHFW=$(;YVS'*_]50TF%^X@*E?+8([`S\V,,PK40\U8(5C;\OP3N5$J5\%B6=
+>VH\]_K__W.9_`!8LB/6BI+FI`````$E%3D2N0F""
+`
+end
--- kdelibs-3.5.10.dfsg.1.orig/debian/icons/cr32-device-system.png.uu
+++ kdelibs-3.5.10.dfsg.1/debian/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.10.dfsg.1.orig/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_94_xdg_dirs_i18n.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_94_xdg_dirs_i18n.diff
@@ -0,0 +1,11 @@
+diff -Nur kdelibs-3.5.8/kdecore/klocale.cpp kdelibs-3.5.8.new/kdecore/klocale.cpp
+--- kdelibs-3.5.8/kdecore/klocale.cpp	2007-11-14 14:57:32.000000000 +0000
++++ kdelibs-3.5.8.new/kdecore/klocale.cpp	2007-11-14 14:59:39.000000000 +0000
+@@ -138,6 +138,7 @@
+     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
++      d->catalogNames.append( "xdg-user-dirs" );
+     }
+     updateCatalogues(); // evaluate this for all languages
+   }
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_93_speedbar_xdg_user_dirs.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_93_speedbar_xdg_user_dirs.diff
@@ -0,0 +1,74 @@
+diff -Nur -x '*.orig' -x '*~' kdelibs-3.5.9/kio/kfile/kfilespeedbar.cpp kdelibs-3.5.9.new/kio/kfile/kfilespeedbar.cpp
+--- kdelibs-3.5.9/kio/kfile/kfilespeedbar.cpp	2005-10-10 17:05:43.000000000 +0200
++++ kdelibs-3.5.9.new/kio/kfile/kfilespeedbar.cpp	2008-03-11 12:51:47.000000000 +0100
+@@ -20,6 +20,9 @@
+ #include "config-kfile.h"
+ 
+ #include <qdir.h>
++#include <qfile.h>
++#include <qtextcodec.h>
++#include <qtextstream.h>
+ 
+ #include <kconfig.h>
+ #include <kglobal.h>
+@@ -50,7 +53,7 @@
+             QDir(KGlobalSettings::documentPath()).exists())
+         {
+             u.setPath( KGlobalSettings::documentPath() );
+-            insertItem( u, i18n("Documents"), false, "document" );
++            insertItem( u, i18n("Documents"), false, "folder_txt" );
+         }
+ 
+         u.setPath( QDir::homeDirPath() );
+@@ -62,6 +65,51 @@
+             insertItem( u, i18n("Storage Media"), false,
+                                    KProtocolInfo::icon( "media" ) );
+ 
++        if (  QFile::exists(  QDir::homeDirPath()+"/.config/user-dirs.dirs" ) )
++        {
++			QString download, music, pictures, videos, templates, publicShares;
++
++            QFile f(  QDir::homeDirPath()+"/.config/user-dirs.dirs" );
++			if (!f.open(IO_ReadOnly))
++				return;
++
++			QTextStream s( &f );
++			s.setCodec( QTextCodec::codecForLocale() );
++
++			// read the xdg user dirs
++			QString line = s.readLine();
++			while (!line.isNull())
++			{
++				if (line.startsWith("XDG_DOWNLOAD_DIR="))
++					download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++				else if (line.startsWith("XDG_MUSIC_DIR="))
++					music = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++				else if (line.startsWith("XDG_PICTURES_DIR="))
++					pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++				else if (line.startsWith("XDG_VIDEOS_DIR="))
++					videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++				else if (line.startsWith("XDG_TEMPLATES_DIR="))
++					templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++				else if (line.startsWith("XDG_PUBLICSHARES_DIR="))
++					publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++
++				line = s.readLine();
++			}
++			// now add in the speedbar
++			if (!download.isEmpty())
++                insertItem( download, i18n( "Download" ), false, "folder_html" );
++			if (!music.isEmpty())
++                insertItem( music, i18n( "Music" ), false, "folder_sound" );
++			if (!pictures.isEmpty())
++                insertItem( pictures, i18n( "Pictures" ), false, "folder_image" );
++			if (!videos.isEmpty())
++                insertItem( videos, i18n( "Videos" ), false, "folder_video" );
++			if (!templates.isEmpty())
++                insertItem( templates, i18n( "Templates" ), false, "folder_video" );
++			if (!publicShares.isEmpty())
++                insertItem( publicShares, i18n( "Public" ), false, "folder_video" );
++        }
++        
+         u = "remote:/";
+         if ( KProtocolInfo::isKnownProtocol( u ) )
+             insertItem( u, i18n("Network Folders"), false,
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_arm_ftbfs_fix.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_arm_ftbfs_fix.diff
@@ -0,0 +1,11 @@
+diff -Nur -x '*.orig' -x '*~' kdelibs-3.5.10.dfsg.1/kdeprint/management/kmmainview.cpp kdelibs-3.5.10.dfsg.1.new/kdeprint/management/kmmainview.cpp
+--- kdelibs-3.5.10.dfsg.1/kdeprint/management/kmmainview.cpp	2008-11-21 21:47:35.000000000 -0500
++++ kdelibs-3.5.10.dfsg.1.new/kdeprint/management/kmmainview.cpp	2008-11-21 22:01:12.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include "plugincombobox.h"
+ #include "kiconselectaction.h"
+ #include "messagewindow.h"
++#include "kprocess.h"
+ 
+ #include <qdockarea.h>
+ #include <kmenubar.h>
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_65_nzb_mimetype.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/21_kfreebsd_support.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/21_kfreebsd_support.diff
@@ -0,0 +1,97 @@
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -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
+--- a/kdecore/kpty.cpp
++++ b/kdecore/kpty.cpp
+@@ -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)
+--- a/kinit/kinit.cpp
++++ b/kinit/kinit.cpp
+@@ -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 )
+--- a/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp
+@@ -1881,7 +1881,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.10.dfsg.1.orig/debian/patches/53_kdelibs_ltdl_ext.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/53_kdelibs_ltdl_ext.diff
@@ -0,0 +1,10 @@
+--- a/libltdl/ltdl.c
++++ b/libltdl/ltdl.c
+@@ -184,6 +184,7 @@
+ #define LT_DLSTRERROR(name)	lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
+ 
+ static	const char	objdir[]		= LTDL_OBJDIR;
++#define LTDL_SHLIB_EXT ".so"
+ #ifdef	LTDL_SHLIB_EXT
+ static	const char	shlib_ext[]		= LTDL_SHLIB_EXT;
+ #endif
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/49_hurd_support.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/49_hurd_support.diff
@@ -0,0 +1,134 @@
+--- a/kio/kio/kurlcompletion.cpp
++++ b/kio/kio/kurlcompletion.cpp
+@@ -231,6 +231,9 @@
+ 		while ( !terminationRequested() &&
+ 		        (dirEntry = ::readdir( dir)))
+ #else
++#if !defined(MAXPATHLEN) && defined(__GNU__)
++#define MAXPATHLEN UCHAR_MAX
++#endif
+ 		struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 );
+ 		struct dirent *dirEntry = 0;
+ 		while ( !terminationRequested() &&
+--- a/kdoctools/meinproc.cpp
++++ b/kdoctools/meinproc.cpp
+@@ -136,9 +136,18 @@
+     }
+ 
+     if ( args->isSet( "check" ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        char *pwd_buffer;
++#else
+         char pwd_buffer[PATH_MAX];
++#endif
+         QFileInfo file( QFile::decodeName(args->arg( 0 )) );
+-        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        if ( !(pwd_buffer = getcwd( NULL, 0 ) ) )
++#else
++        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) )
++#endif
++	{
+ 	     kdError() << "getcwd failed." << endl;
+              return 2;
+ 	}
+@@ -175,11 +184,18 @@
+             }
+             pclose( xmllint );
+             chdir( pwd_buffer );
+-            if ( !noout )
++            if ( !noout ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++                free( pwd_buffer );
++#endif
+                 return 1;
++            }
+         } else {
+             kdWarning() << "couldn't find xmllint" << endl;
+         }
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        free( pwd_buffer );
++#endif
+     }
+ 
+     xmlSubstituteEntitiesDefault(1);
+--- a/kioslave/file/file.cc
++++ b/kioslave/file/file.cc
+@@ -1234,8 +1234,13 @@
+        directories we keep as active directory. And
+        as the slave runs in the background, it's hard
+        to see for the user what the problem would be */
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++    char *path_buffer;
++    path_buffer = getcwd(NULL, 0);
++#else
+     char path_buffer[PATH_MAX];
+     (void) getcwd(path_buffer, PATH_MAX - 1);
++#endif
+     if ( chdir( _path.data() ) )  {
+         if (errno == EACCES)
+             error(ERR_ACCESS_DENIED, _path);
+@@ -1261,6 +1266,9 @@
+     kdDebug(7101) << "============= COMPLETED LIST ============" << endl;
+ 
+     chdir(path_buffer);
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++    free(path_buffer);
++#endif
+ 
+     finished();
+ }
+--- a/libkmid/fmout.cc
++++ b/libkmid/fmout.cc
+@@ -127,8 +127,8 @@
+ void FMOut::loadFMPatches(void)
+ {
+ #ifdef HAVE_OSS_SUPPORT
+-  char patchesfile[PATH_MAX];
+-  char drumsfile[PATH_MAX];
++  char patchesfile[strlen(FMPatchesDirectory)+7+1];
++  char drumsfile[strlen(FMPatchesDirectory)+9+1];
+   int size;
+   struct sbi_instrument instr;
+   char tmp[60];
+@@ -141,12 +141,12 @@
+ 
+   if (opl==3)
+   {
+-    snprintf(patchesfile, PATH_MAX, "%s/std.o3",FMPatchesDirectory);
++    snprintf(patchesfile, sizeof(patchesfile), "%s/std.o3",FMPatchesDirectory);
+     size=60;
+   }
+   else
+   {
+-    snprintf(patchesfile, PATH_MAX, "%s/std.sb",FMPatchesDirectory);
++    snprintf(patchesfile, sizeof(patchesfile), "%s/std.sb",FMPatchesDirectory);
+     size=52;
+   }
+   fh=fopen(patchesfile,"rb");
+@@ -171,11 +171,11 @@
+ 
+   if (opl==3)
+   {
+-    snprintf(drumsfile, PATH_MAX, "%s/drums.o3",FMPatchesDirectory);
++    snprintf(drumsfile, sizeof(drumsfile), "%s/drums.o3",FMPatchesDirectory);
+   }
+   else
+   {
+-    snprintf(drumsfile, PATH_MAX, "%s/drums.sb",FMPatchesDirectory);
++    snprintf(drumsfile, sizeof(drumsfile), "%s/drums.sb",FMPatchesDirectory);
+   }
+ 
+   fh=fopen(drumsfile,"rb");
+--- a/kinit/lnusertemp.c
++++ b/kinit/lnusertemp.c
+@@ -89,6 +89,9 @@
+ }
+ 
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+ int build_link(const char *tmp_prefix, const char *kde_prefix)
+ {
+   struct passwd *pw_ent;
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/10_kstandarddirs.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/10_kstandarddirs.diff
@@ -0,0 +1,31 @@
+--- a/kdecore/kstandarddirs.cpp
++++ b/kdecore/kstandarddirs.cpp
+@@ -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.10.dfsg.1.orig/debian/patches/kubuntu_56_langpacks_desktop_files.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/55_disable_debug_messages_if_not_explicitly_enabled.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/55_disable_debug_messages_if_not_explicitly_enabled.diff
@@ -0,0 +1,23 @@
+--- kdelibs/kdecore/kdebug.cpp
++++ kdelibs.new/kdecore/kdebug.cpp
+@@ -238,7 +238,8 @@
+       break;
+   }
+ 
+-  short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 2) : 2;
++  // if no output mode is specified default to no debug output
++  short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 4) : 4;
+ 
+   // If the application doesn't have a QApplication object it can't use
+   // a messagebox.
+--- kdelibs/kdecore/kdebugrc
++++ kdelibs.new/kdecore/kdebugrc
+@@ -86,7 +86,7 @@
+ 
+ # KMail
+ [5006]
+-InfoOutput=2
++InfoOutput=4
+ 
+ # KitchenSync (Syncing Algorithm)
+ [5250]
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/45_gmail_spoof.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/45_gmail_spoof.diff
@@ -0,0 +1,16 @@
+--- a/khtml/html/html_elementimpl.cpp
++++ b/khtml/html/html_elementimpl.cpp
+@@ -561,6 +561,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.10.dfsg.1.orig/debian/patches/kubuntu_60_kresolver_asserts.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_46_lisa_error.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/27_kdnssd_avahi.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/27_kdnssd_avahi.diff
@@ -0,0 +1,1180 @@
+--- a/dnssd/configure.in.in
++++ b/dnssd/configure.in.in
+@@ -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] ) )
+--- a/dnssd/domainbrowser.cpp
++++ b/dnssd/domainbrowser.cpp
+@@ -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"
+--- a/dnssd/Makefile.am
++++ b/dnssd/Makefile.am
+@@ -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
+--- a/dnssd/publicservice.cpp
++++ b/dnssd/publicservice.cpp
+@@ -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;
+ 	}
+ }
+ 
+--- a/dnssd/publicservice.h
++++ b/dnssd/publicservice.h
+@@ -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);
+--- a/dnssd/query.cpp
++++ b/dnssd/query.cpp
+@@ -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"
+--- a/dnssd/README
++++ b/dnssd/README
+@@ -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.
+ 
+--- a/dnssd/remoteservice.cpp
++++ b/dnssd/remoteservice.cpp
+@@ -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
+ 
+ 
+ }
+--- a/dnssd/responder.cpp
++++ b/dnssd/responder.cpp
+@@ -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
+ }
+ 
+ 
+--- a/dnssd/responder.h
++++ b/dnssd/responder.h
+@@ -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
+--- a/dnssd/sdevent.h
++++ b/dnssd/sdevent.h
+@@ -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
+--- a/dnssd/servicebase.cpp
++++ b/dnssd/servicebase.cpp
+@@ -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;
+ }
+ 
+--- a/dnssd/servicebrowser.cpp
++++ b/dnssd/servicebrowser.cpp
+@@ -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.10.dfsg.1.orig/debian/patches/17_kdelibs_rubberband.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/17_kdelibs_rubberband.diff
@@ -0,0 +1,103 @@
+--- a/kdefx/kstyle.cpp
++++ b/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 );
+ }
+--- a/kdeui/kiconview.cpp
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_70_fileshareset-nfs-kernel-server.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_70_fileshareset-nfs-kernel-server.diff
@@ -0,0 +1,17 @@
+--- kdelibs-3.5.7/kio/misc/fileshareset	2007-04-18 14:38:46.000000000 +0930
++++ kdelibs-3.5.7/kio/misc/fileshareset	2007-04-18 14:42:07.000000000 +0930
+@@ -285,7 +285,12 @@
+ 	    system('PATH=/bin:/sbin pidof nfsd >/dev/null') != 0) {
+ 	    # trying to start the server...
+ 	    system('/etc/init.d/portmap start') if system('/etc/init.d/portmap status') != 0;
+-	    system('/etc/init.d/nfs', $_) foreach 'stop', 'start';
++            if ( -f '/etc/init.d/nfs' ) {
++	        system('/etc/init.d/nfs', $_) foreach 'stop', 'start';
++            }
++            elsif ( -f '/etc/init.d/nfs-kernel-server' ) {
++	        system('/etc/init.d/nfs-kernel-server', $_) foreach 'stop', 'start';
++            }
+ 	}
+ 	exit 0;
+     }
+
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_03_applications_menu_entries_move.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_03_applications_menu_entries_move.diff
@@ -0,0 +1,103 @@
+--- kdelibs/kded/applications.menu	2007-06-07 16:26:50.000000000 +0100
++++ kdelibs/kded/applications.menu	2007-06-07 16:27:08.000000000 +0100
+@@ -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>
+@@ -325,6 +326,7 @@
+ 			<Category>Office</Category>
+                         <Not><Category>X-KDE-More</Category></Not>
+                         </And>
++			<Filename>ooo-draw.desktop</Filename>
+                 </Include>
+                 <Menu>
+                         <Name>More</Name>
+@@ -376,74 +378,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.10.dfsg.1.orig/debian/patches/61_httpheader_backport.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/61_httpheader_backport.diff
@@ -0,0 +1,13 @@
+Index: kdelibs/kioslave/http/http.cc
+===================================================================
+--- kdelibs/kioslave/http/http.cc	(revisión: 860100)
++++ kdelibs/kioslave/http/http.cc	(revisión: 860101)
+@@ -2753,7 +2753,7 @@
+     // calling application later
+     m_responseHeaders << QString::fromLatin1(buf);
+ 
+-    if ((strncasecmp(buf, "HTTP", 4) == 0) ||
++    if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
+         (strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
+     {
+       if (strncasecmp(buf, "ICY ", 4) == 0)
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/15_dcopidlng_jfs-patch.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/15_dcopidlng_jfs-patch.diff
@@ -0,0 +1,22 @@
+--- a/dcop/dcopidlng/dcopidlng
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_9901_system_config_printer_applet.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_9901_system_config_printer_applet.diff
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.9/kdeprint/kprinter.cpp~	2005-10-10 16:06:34.000000000 +0100
++++ kdelibs-3.5.9/kdeprint/kprinter.cpp	2008-03-12 16:08:30.000000000 +0000
+@@ -403,7 +403,7 @@
+ 			}
+ 			else
+ 			{
+-				if (/* !outputToFile() && */ startviewer)
++				if (/* !outputToFile() && */ startviewer && !QFile::exists("/etc/xdg/autostart/system-config-printer-applet-kde.desktop") )
+ 				{
+ 					QStringList args;
+ 					args << "-d";
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_93_xdg_dirs_document_path.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_93_xdg_dirs_document_path.diff
@@ -0,0 +1,85 @@
+--- kdelibs-3.5.7/kdecore/kglobalsettings.cpp.fix_default_document_path	2005-10-10 12:06:03.000000000 -0300
++++ kdelibs-3.5.7/kdecore/kglobalsettings.cpp	2007-09-27 18:59:32.000000000 -0300
+@@ -50,6 +50,10 @@ static QRgb qt_colorref2qrgb(COLORREF co
+ #include <stdlib.h>
+ #include <kprotocolinfo.h>
+ 
++#include <qtextcodec.h>
++#include <qtextstream.h>
++#include <qfile.h>
++
+ #ifdef Q_WS_X11
+ #include <X11/Xlib.h>
+ #endif
+@@ -77,6 +81,31 @@ QColor *KGlobalSettings::alternateColor 
+ 
+ KGlobalSettings::KMouseSettings *KGlobalSettings::s_mouseSettings = 0;
+ 
++// helper function for reading xdg user dirs: it is required in order to take 
++// care of locale stuff
++void readXdgUserDirs(QString *desktop, QString *documents)
++{
++	QFile f( QDir::homeDirPath() + "/.config/user-dirs.dirs" );
++
++	if (!f.open(IO_ReadOnly))
++		return;
++
++	// set the codec for the current locale
++	QTextStream s(&f);
++	s.setCodec( QTextCodec::codecForLocale() );
++
++	QString line = s.readLine();
++	while (!line.isNull())
++	{
++		if (line.startsWith("XDG_DESKTOP_DIR="))
++			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
++			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
++
++		line = s.readLine();
++	}
++}
++
+ int KGlobalSettings::dndEventDelay()
+ {
+     KConfigGroup g( KGlobal::config(), "General" );
+@@ -483,13 +512,17 @@ void KGlobalSettings::initStatic() // sh
+ 
+     KConfigGroup g( KGlobal::config(), "Paths" );
+ 
+-    // Desktop Path
+-    *s_desktopPath = QDir::homeDirPath() + "/Desktop/";
+-    *s_desktopPath = g.readPathEntry( "Desktop", *s_desktopPath);
++	// Read desktop and documents path using XDG_USER_DIRS
++	readXdgUserDirs(s_desktopPath, s_documentPath);
++	
+     *s_desktopPath = QDir::cleanDirPath( *s_desktopPath );
+     if ( !s_desktopPath->endsWith("/") )
+       s_desktopPath->append('/');
+ 
++    *s_documentPath = QDir::cleanDirPath( *s_documentPath );
++    if ( !s_documentPath->endsWith("/"))
++      s_documentPath->append('/');
++
+     // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
+     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
+     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
+@@ -510,18 +543,6 @@ void KGlobalSettings::initStatic() // sh
+     if ( !s_autostartPath->endsWith("/") )
+       s_autostartPath->append('/');
+ 
+-    // Document Path
+-    *s_documentPath = g.readPathEntry( "Documents", 
+-#ifdef Q_WS_WIN
+-        getWin32ShellFoldersPath("Personal")
+-#else
+-        QDir::homeDirPath()
+-#endif
+-    );
+-    *s_documentPath = QDir::cleanDirPath( *s_documentPath );
+-    if ( !s_documentPath->endsWith("/"))
+-      s_documentPath->append('/');
+-
+     // Make sure this app gets the notifications about those paths
+     if (kapp)
+         kapp->addKipcEventMask(KIPC::SettingsChanged);
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_19_debianize_useragent.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -0,0 +1,39 @@
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -450,14 +450,19 @@
+      return d->useragent;
+ 
+   QString supp;
++  int debian_append = 0;
+   struct utsname nam;
+   if( uname(&nam) >= 0 )
+   {
+     if( modifiers.contains('o') )
+     {
+       supp += QString("; %1").arg(nam.sysname);
++      debian_append = 1;
+       if ( modifiers.contains('v') )
++      {
+         supp += QString(" %1").arg(nam.release);
++        debian_append = 2;
++      }
+     }
+     if( modifiers.contains('p') )
+     {
+@@ -485,6 +490,16 @@
+   }
+   d->modifiers = modifiers;
+   d->useragent = CFG_DEFAULT_UAGENT(supp);
++
++  if (debian_append == 1)
++    d->useragent.append(" (Kubuntu)");
++  else if (debian_append == 2)
++  {
++#define STRINGIFY(macro_or_string) STRINGIFY_ARG(macro_or_string)
++#define STRINGIFY_ARG(contents) #contents
++    d->useragent.append(" (Kubuntu package " STRINGIFY(DEBIAN_VERSION) ")");
++  }
++  
+   return d->useragent;
+ }
+ 
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_06_kwallet_simplify_string.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/47_better_tty_err_msg_kdeinit.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/47_better_tty_err_msg_kdeinit.diff
@@ -0,0 +1,24 @@
+--- a/kinit/kinit.cpp
++++ b/kinit/kinit.cpp
+@@ -256,18 +256,18 @@
+     int fd = open( tty, O_WRONLY );
+     if( fd < 0 )
+     {
+-        perror( "kdeinit: couldn't open() tty" );
++        fprintf(stderr, "kdeinit: couldn't open() %s: %s\n", tty, strerror (errno) );
+         return;
+     }
+     if( dup2( fd, STDOUT_FILENO ) < 0 )
+     {
+-        perror( "kdeinit: couldn't dup2() tty" );
++        fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) );
+         close( fd );
+         return;
+     }
+     if( dup2( fd, STDERR_FILENO ) < 0 )
+     {
+-        perror( "kdeinit: couldn't dup2() tty" );
++        fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) );
+         close( fd );
+         return;
+     }
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/04_am_maintainer_mode_extra.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/04_am_maintainer_mode_extra.diff
@@ -0,0 +1,11 @@
+--- a/configure.in.in
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_97_kde4_menu_applications.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_97_kde4_menu_applications.diff
@@ -0,0 +1,80 @@
+--- kdelibs-3.5.8/kio/kio/kservice.cpp	2007-01-15 11:34:09.000000000 +0000
++++ kdelibs-3.5.8/kio/kio/kservice.cpp	2008-01-29 12:41:54.000000000 +0000
+@@ -97,6 +97,7 @@
+   m_bValid = true;
+ 
+   bool absPath = !QDir::isRelativePath(entryPath());
++  bool kde4application = config->fileName().startsWith("/usr/share/applications/kde4/");
+ 
+   config->setDesktopGroup();
+ 
+@@ -192,9 +193,28 @@
+      name = name.left(pos);
+ 
+   m_strExec = config->readPathEntry( "Exec" );
++  if (kde4application && !m_strExec.startsWith("/")) {
++    m_strExec = "/usr/lib/kde4/bin/"+m_strExec;
++  } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
++    int space = m_strExec.find(" ");
++    if (space==-1)
++      m_strExec = KStandardDirs::findExe(m_strExec);
++    else {
++      const QString command = m_strExec.left(space);
++      m_strExec.replace(command,KStandardDirs::findExe(command));
++    }
++  }
++
+   entryMap.remove("Exec");
+ 
+   m_strIcon = config->readEntry( "Icon", "unknown" );
++  if (kde4application) {
++    if (QFile::exists("/usr/lib/kde4/share/icons/oxygen/22x22/apps/" + m_strIcon + ".png")) {
++      m_strIcon = "/usr/lib/kde4/share/icons/oxygen/22x22/apps/" + m_strIcon + ".png";
++    } else if (QFile::exists("/usr/lib/kde4/share/icons/hicolor/22x22/apps/" + m_strIcon + ".png")) {
++      m_strIcon = "/usr/lib/kde4/share/icons/hicolor/22x22/apps/" + m_strIcon + ".png";
++    }
++  }
+   entryMap.remove("Icon");
+   m_bTerminal = (config->readBoolEntry( "Terminal" )); // should be a property IMHO
+   entryMap.remove("Terminal");
+@@ -205,6 +225,9 @@
+   m_strComment = config->readEntry( "Comment" );
+   entryMap.remove("Comment");
+   m_strGenName = config->readEntry( "GenericName" );
++  if (kde4application) {
++    m_strGenName += " (KDE4)";
++  }
+   entryMap.remove("GenericName");
+   QString untranslatedGenericName = config->readEntryUntranslated( "GenericName" );
+   entryMap.insert("UntranslatedGenericName", untranslatedGenericName);
+@@ -221,7 +244,8 @@
+   m_lstServiceTypes = config->readListEntry( "ServiceTypes" );
+   entryMap.remove("ServiceTypes");
+   // For compatibility with KDE 1.x
+-  m_lstServiceTypes += config->readListEntry( "MimeType", ';' );
++  if (!kde4application)
++     m_lstServiceTypes += config->readListEntry( "MimeType", ';' );
+   entryMap.remove("MimeType");
+ 
+   if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") )
+@@ -240,6 +264,8 @@
+      m_DCOPServiceType = DCOP_None;
+ 
+   m_strDesktopEntryName = name.lower();
++  if (kde4application)
++     m_strDesktopEntryName = "kde4-" + m_strDesktopEntryName;
+ 
+   m_bAllowAsDefault = config->readBoolEntry( "AllowDefault", true );
+   entryMap.remove("AllowDefault");
+@@ -286,7 +286,10 @@
+   for( ; it != entryMap.end();++it)
+   {
+      //qDebug("   Key = %s Data = %s", it.key().latin1(), it.data().latin1());
+-     m_mapProps.insert( it.key(), QVariant( it.data()));
++      QString key = it.key();
++      if (kde4application && key=="OnlyShowIn" && it.data()=="KDE;")
++         key = "NotShowIn";
++      m_mapProps.insert( key, QVariant( it.data()));
+   }
+ }
+ 
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/34_cups12_init_script.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/34_cups12_init_script.diff
@@ -0,0 +1,20 @@
+--- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp
++++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+@@ -206,14 +206,9 @@
+ 	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/cups restart";
++		success = proc.start( KProcess::Block ) && proc.normalExit();
+                 if( !success )    
+ 			msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
+ 	}
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_62_flash_installer.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_69_applications_merged.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_69_applications_merged.diff
@@ -0,0 +1,10 @@
+diff -Nur kdelibs-3.5.8/kded/applications.menu kdelibs-3.5.8.new/kded/applications.menu
+--- kdelibs-3.5.8/kded/applications.menu	2007-11-13 18:48:54.000000000 +0000
++++ kdelibs-3.5.8.new/kded/applications.menu	2007-11-13 18:49:36.000000000 +0000
+@@ -420,5 +420,6 @@
+ 		<MergeFile>debian-menu.menu</MergeFile>
+ 	</Menu>
+ 
++	<MergeDir>applications-merged</MergeDir>
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
+ </Menu>
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_45_kcmoduleinfo.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/24_libkdefakes_pic.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/24_libkdefakes_pic.diff
@@ -0,0 +1,24 @@
+--- a/kdecore/Makefile.am
++++ b/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.10.dfsg.1.orig/debian/patches/16_qtmotifplus.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/16_qtmotifplus.diff
@@ -0,0 +1,8 @@
+--- a/kstyles/themes/qtmotifplus.themerc
++++ b/kstyles/themes/qtmotifplus.themerc
+@@ -98,5 +98,3 @@
+ Comment[zu]=Isitayela se-Mofit esenziwe ngcono
+ [KDE]
+ WidgetStyle=MotifPlus
+-[Desktop Entry]
+-Hidden=true
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_95_fix_smb_scan.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_95_fix_smb_scan.diff
@@ -0,0 +1,50 @@
+diff -Nru kdelibs-3.5.8.orig/kdeprint/management/smbview.cpp kdelibs-3.5.8/kdeprint/management/smbview.cpp
+--- kdelibs-3.5.8.orig/kdeprint/management/smbview.cpp	2007-10-08 11:52:10.000000000 +0200
++++ kdelibs-3.5.8/kdeprint/management/smbview.cpp	2007-12-06 18:20:48.000000000 +0100
+@@ -179,11 +179,8 @@
+ 			m_current = item;
+ 			*m_proc << "nmblookup"+m_wins_server+"-M ";
+                         *m_proc << KProcess::quote(item->text(0));
+-                        *m_proc << " -S | grep '<20>' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*<20>.*//' | xargs -Iserv_name smbclient -N -L 'serv_name' -W ";
+-                        *m_proc << KProcess::quote(item->text(0));
+-			*m_proc << " -A ";
+-                        *m_proc << KProcess::quote(m_passwdFile->name());
+-			startProcess(ServerListing);
++                        *m_proc << " -S";
++                        startProcess(ServerListing);
+ 		}
+ 		else if (item->depth() == 1)
+ 		{ // opening server
+@@ -192,8 +189,11 @@
+                         *m_proc << KProcess::quote(item->text(0));
+                         *m_proc << " -W ";
+                         *m_proc << KProcess::quote(item->parent()->text(0));
+-			*m_proc << " -A ";
+-                        *m_proc << KProcess::quote(m_passwdFile->name());
++                        if (m_login != QString::null)
++                        {
++				*m_proc << " -A ";
++                        	*m_proc << KProcess::quote(m_passwdFile->name());
++                        }
+ 			startProcess(ShareListing);
+ 		}
+ 	}
+@@ -220,16 +220,14 @@
+ 	QStringList	lines = QStringList::split('\n',m_buffer,true);
+ 	QString		line;
+ 	uint 		index(0);
+-	for (;index < lines.count();index++)
+-		if (lines[index].stripWhiteSpace().startsWith("Server"))
+-			break;
+-	index += 2;
+ 	while (index < lines.count())
+ 	{
+ 		line = lines[index++].stripWhiteSpace();
+ 		if (line.isEmpty())
+ 			break;
+ 		QStringList	words = QStringList::split(' ',line,false);
++		if (words[1] != "<00>" || words[3] == "<GROUP>")
++			continue;
+ 		QListViewItem	*item = new QListViewItem(m_current,words[0]);
+ 		item->setExpandable(true);
+ 		item->setPixmap(0,SmallIcon("kdeprint_computer"));
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/20_no_libadd_in_convenience_libs.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/20_no_libadd_in_convenience_libs.diff
@@ -0,0 +1,62 @@
+--- a/kdoctools/Makefile.am
++++ b/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
+--- a/kspell2/Makefile.am
++++ b/kspell2/Makefile.am
+@@ -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)
+--- a/kspell2/ui/Makefile.am
++++ b/kspell2/ui/Makefile.am
+@@ -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 
+--- a/kspell2/tests/Makefile.am
++++ b/kspell2/tests/Makefile.am
+@@ -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.10.dfsg.1.orig/debian/patches/23_libtool_workaround_buildfix.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/23_libtool_workaround_buildfix.diff
@@ -0,0 +1,11 @@
+--- a/kdoctools/Makefile.am
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_53_tabs_hover_close_delaying.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_92_kdeprint_filter.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/11_applications_menu.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/11_applications_menu.diff
@@ -0,0 +1,15 @@
+--- a/kded/applications.menu
++++ b/kded/applications.menu
+@@ -465,5 +465,12 @@
+ 		</And>
+ 	</Include>
+ 	<DefaultMergeDirs/>
++
++	<Menu>
++		<Name>Debian</Name>
++		<Directory>debian.directory</Directory>
++		<MergeFile>debian-menu.menu</MergeFile>
++	</Menu>
++
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
+ </Menu>
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/43_hardcode_xdgMenuPrefix.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/43_hardcode_xdgMenuPrefix.diff
@@ -0,0 +1,13 @@
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
+@@ -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.10.dfsg.1.orig/debian/patches/kubuntu_04_add_langpack_path.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_9902_kde4_kded_blacklist_modules.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_9902_kde4_kded_blacklist_modules.diff
@@ -0,0 +1,39 @@
+--- ./kded/kded.cpp.orig	2007-10-08 11:52:10.000000000 +0200
++++ ./kded/kded.cpp	2008-11-20 12:18:43.000000000 +0100
+@@ -48,6 +48,8 @@
+ #include <kio/global.h>
+ #include <kservicetype.h>
+ 
++#include <cstdlib>
++
+ #ifdef Q_WS_X11
+ #include <X11/Xlib.h>
+ #include <fixx11h.h>
+@@ -162,12 +164,27 @@
+         kde_running = false;
+      // Preload kded modules.
+      KService::List kdedModules = KServiceType::offers("KDEDModule");
++     QString version = getenv( "KDE_SESSION_VERSION" );
++     QStringList blacklist;
++     if ( version >= "4" )
++     {
++         kdDebug(7020) << "KDE4 is running." << endl;
++         blacklist << "mediamanager" << "medianotifier" << "kmilod" << "kwrited";
++     }
+      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
+      {
+          KService::Ptr service = *it;
+          bool autoload = service->property("X-KDE-Kded-autoload", QVariant::Bool).toBool();
+          config->setGroup(QString("Module-%1").arg(service->desktopEntryName()));
+          autoload = config->readBoolEntry("autoload", autoload);
++         for (QStringList::Iterator module = blacklist.begin(); module != blacklist.end(); ++module)
++         {
++            if (service->desktopEntryName() == *module)
++            {
++               autoload = false;
++               break;
++            }
++         }
+          if( m_newStartup )
+          {
+             // see ksmserver's README for description of the phases
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/13_cups_sysgroup.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/13_cups_sysgroup.diff
@@ -0,0 +1,50 @@
+--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ b/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
+--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_51_launchpad_integration.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_51_launchpad_integration.diff
@@ -0,0 +1,132 @@
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/khelpmenu.cpp kdelibs-old.new/kdeui/khelpmenu.cpp
+--- kdelibs-old/kdeui/khelpmenu.cpp	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/khelpmenu.cpp	2008-11-19 21:33:30.000000000 -0500
+@@ -41,6 +41,8 @@
+ #include <kpopupmenu.h>
+ #include <kstdaccel.h>
+ #include <kstdaction.h>
++#include <kprocess.h>
++#include <kstandarddirs.h>
+ 
+ #include "kswitchlanguagedialog.h"
+ 
+@@ -94,6 +96,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);
+     KStdAction::switchApplicationLanguage(this, SLOT(switchApplicationLanguage()), actions);
+   }
+ }
+@@ -164,6 +168,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(),
+@@ -233,6 +241,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 )
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/khelpmenu.h kdelibs-old.new/kdeui/khelpmenu.h
+--- kdelibs-old/kdeui/khelpmenu.h	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/khelpmenu.h	2008-11-19 21:32:55.000000000 -0500
+@@ -219,6 +219,9 @@
+      */
+     void aboutKDE();
+ 
++    void kubuntuTranslate();
++    void kubuntuGetHelpOnline();
++
+     /**
+      * Opens the standard "Report Bugs" dialog box.
+      */
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/kstdaction.cpp kdelibs-old.new/kdeui/kstdaction.cpp
+--- kdelibs-old/kdeui/kstdaction.cpp	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/kstdaction.cpp	2008-11-19 21:32:55.000000000 -0500
+@@ -319,5 +319,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 ); }
+ 
+ }
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/kstdaction.h kdelibs-old.new/kdeui/kstdaction.h
+--- kdelibs-old/kdeui/kstdaction.h	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/kstdaction.h	2008-11-19 21:32:55.000000000 -0500
+@@ -158,6 +158,7 @@
+ 		FullScreen, ///< @since 3.2
+ 		Clear, ///< @since 3.2
+ 		PasteText, ///< @since 3.2
++ 		KubuntuGetHelpOnline, KubuntuTranslate,
+ 		SwitchApplicationLanguage ///< @since 3.5.8
+ 	};
+ 
+@@ -609,6 +610,12 @@
+ 	*/
+ 	KDEUI_EXPORT KAction *switchApplicationLanguage(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
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/kstdaction_p.h kdelibs-old.new/kdeui/kstdaction_p.h
+--- kdelibs-old/kdeui/kstdaction_p.h	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/kstdaction_p.h	2008-11-19 21:32:55.000000000 -0500
+@@ -112,6 +112,8 @@
+ 	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 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 }
+ };
+ 
+diff -Nur -x '*.orig' -x '*~' kdelibs-old/kdeui/ui_standards.rc kdelibs-old.new/kdeui/ui_standards.rc
+--- kdelibs-old/kdeui/ui_standards.rc	2008-11-19 16:35:37.000000000 -0500
++++ kdelibs-old.new/kdeui/ui_standards.rc	2008-11-19 21:32:55.000000000 -0500
+@@ -178,6 +178,9 @@
+     <Separator/>
+     <Action name="switch_application_language"/>
+     <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.10.dfsg.1.orig/debian/patches/54_seli_xinerama.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/54_seli_xinerama.diff
@@ -0,0 +1,548 @@
+KDE Xinerama patches
+
+Patches for KDE3.x with several Xinerama improvements:
+
+ * Alt+tab list of windows can be restriced to a single screen
+ * shortcut for moving the active window to a specific/other Xinerama screen
+ * possibility of configuring on which Xinerama screen new windows will be
+   placed
+ * slightly improved dialog placement in some cases
+ * newly launched applications appear on the same Xinerama screen where minicli
+   was shown
+ * possibility of configuring the active Xinerama screen to be the one with the
+   active window instead of the one with the cursor
+ * shortcut for activating specific/other Xinerama screen
+
+Author: Lubos Lunak <l.lunak@kde.org>
+
+--- a/kio/kio/krun.h
++++ b/kio/kio/krun.h
+@@ -111,6 +111,8 @@
+    */
+   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 @@
+    * @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 @@
+   /// @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 @@
+   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 @@
+    * 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 @@
+   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;
+--- a/kio/kio/krun.cpp
++++ b/kio/kio/krun.cpp
+@@ -77,6 +77,7 @@
+     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 @@
+   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 @@
+       {
+         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 @@
+ 
+   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 @@
+     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 @@
+ }
+ 
+ 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 @@
+   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 @@
+       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 );
+@@ -635,7 +644,8 @@
+   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;
+@@ -654,7 +664,7 @@
+       {
+          KURL::List singleUrl;
+          singleUrl.append(*it);
+-         runTempService( _service, singleUrl, tempFiles, suggestedFileName );
++         runTempService( _service, singleUrl, window, "", tempFiles, suggestedFileName );
+       }
+       KURL::List singleUrl;
+       singleUrl.append(_urls.first());
+@@ -673,7 +683,7 @@
+      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...
+@@ -734,11 +744,22 @@
+ 
+ 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()))
+   {
+@@ -759,7 +780,7 @@
+ 
+   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;
+@@ -773,9 +794,25 @@
+ 
+   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)
+@@ -800,33 +837,47 @@
+ 
+ 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;
+@@ -842,6 +893,7 @@
+   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
+@@ -942,7 +994,7 @@
+        KService::Ptr service = KService::serviceByStorageId( exec );
+        if (service)
+        {
+-          run( *service, urls );
++          run( *service, urls, d->m_window, d->m_asn );
+           ok = true;
+        }
+     }
+@@ -1235,7 +1287,7 @@
+       {
+           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,
+@@ -1250,7 +1302,7 @@
+     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{
+--- a/kdecore/kstartupinfo.cpp
++++ b/kdecore/kstartupinfo.cpp
+@@ -1109,7 +1109,7 @@
+ 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;
+@@ -1121,6 +1121,8 @@
+     KStartupInfoData::TriState silent;
+     unsigned long timestamp;
+     int screen;
++    int xinerama;
++    WId launched_by;
+     };
+ 
+ QString KStartupInfoData::to_text() const
+@@ -1151,6 +1153,10 @@
+         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;
+     }
+ 
+@@ -1169,6 +1175,8 @@
+     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 )
+@@ -1199,6 +1207,10 @@
+             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 );
+         }
+     }
+ 
+@@ -1242,6 +1254,10 @@
+         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()
+@@ -1412,6 +1428,26 @@
+     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 )
+     {
+--- a/kdecore/netwm_def.h
++++ b/kdecore/netwm_def.h
+@@ -610,6 +610,7 @@
+         WM2WindowRole          = 1<<11, ///< @since 3.3
+         WM2ClientMachine       = 1<<12, ///< @since 3.3
+         WM2ShowingDesktop      = 1<<13, ///< @since 3.5
++        WM2FullPlacement       = 1<<14,
+         WM2DesktopLayout       = 1<<15  ///< @since 3.5.8
+     };
+ 
+--- a/kdecore/netwm.cpp
++++ b/kdecore/netwm.cpp
+@@ -145,6 +145,9 @@
+ // 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);
+@@ -236,7 +239,7 @@
+ }
+ 
+ 
+-static const int netAtomCount = 84;
++static const int netAtomCount = 85;
+ static void create_atoms(Display *d) {
+     static const char * const names[netAtomCount] =
+     {
+@@ -330,7 +333,9 @@
+             "_KDE_NET_WM_TEMPORARY_RULES",
+ 
+ 	    "WM_STATE",
+-	    "WM_PROTOCOLS"
++	    "WM_PROTOCOLS",
++            
++            "_NET_WM_FULL_PLACEMENT"
+ 	    };
+ 
+     Atom atoms[netAtomCount], *atomsp[netAtomCount] =
+@@ -425,7 +430,9 @@
+             &kde_net_wm_temporary_rules,
+ 
+ 	    &xa_wm_state,
+-	    &wm_protocols
++	    &wm_protocols,
++            
++            &net_wm_full_placement
+ 	    };
+ 
+     assert( !netwm_atoms_created );
+@@ -1355,6 +1362,8 @@
+ 
+     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);
+@@ -1587,6 +1596,8 @@
+ 
+     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;
+--- a/kdecore/kstartupinfo.h
++++ b/kdecore/kstartupinfo.h
+@@ -635,6 +635,30 @@
+          * 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
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/01_admin_cleanup.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/01_admin_cleanup.diff
@@ -0,0 +1,116 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
+   fi
+ done
+ 
++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
++LIB_QT_EXT="$LIB_QT"
++LIB_QT="$kde_int_qt"
++
++AC_SUBST(LIB_QT_EXT)
+ AC_SUBST(LIB_QT)
+ AC_SUBST(LIB_QPE)
+ 
+@@ -2698,7 +2703,7 @@
+ ],
+     [return (TIFFOpen( "", "r") == 0); ],
+ [
+-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
++    kde_cv_libtiff_$1="-l$1"
+ ], [
+     kde_cv_libtiff_$1=no
+ ])
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
+@@ -2377,16 +2377,16 @@
+ 	    # 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
++#	    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 $EXIT_FAILURE
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_68_xdg_autostart.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_68_xdg_autostart.diff
@@ -0,0 +1,25 @@
+--- ./kinit/autostart.cpp.orig	2006-05-22 20:14:16.000000000 +0200
++++ ./kinit/autostart.cpp	2008-11-20 12:17:07.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <kdesktopfile.h>
+ #include <kglobal.h>
+ #include <kstandarddirs.h>
++#include <cstdlib>
+ 
+ class AutoStartItem
+ {
+@@ -48,6 +49,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.10.dfsg.1.orig/debian/patches/kubuntu_glibc_2.8_ftbfs.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_glibc_2.8_ftbfs.diff
@@ -0,0 +1,28 @@
+Index: kdelibs-3.5.10.dfsg.1/kio/kio/kdirwatch.cpp
+===================================================================
+--- kdelibs-3.5.10.dfsg.1.orig/kio/kio/kdirwatch.cpp	2008-11-19 16:19:13.000000000 -0500
++++ kdelibs-3.5.10.dfsg.1/kio/kio/kdirwatch.cpp	2008-11-19 16:20:53.000000000 -0500
+@@ -71,22 +71,7 @@
+ #include <linux/types.h>
+ // Linux kernel headers are documented to not compile
+ #define _S390_BITOPS_H
+-#include <linux/inotify.h>
+-
+-static inline int inotify_init (void)
+-{
+-  return syscall (__NR_inotify_init);
+-}
+-
+-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
+-{
+-  return syscall (__NR_inotify_add_watch, fd, name, mask);
+-}
+-
+-static inline int inotify_rm_watch (int fd, __u32 wd)
+-{
+-  return syscall (__NR_inotify_rm_watch, fd, wd);
+-}
++#include <sys/inotify.h>
+ 
+ #ifndef  IN_ONLYDIR
+ #define  IN_ONLYDIR 0x01000000 
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_98_fix_khc_invocation.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_98_fix_khc_invocation.diff
@@ -0,0 +1,32 @@
+diff -Nur -x '*.orig' -x '*~' kdelibs-3.5.10.dfsg.1/kdecore/kapplication.cpp kdelibs-3.5.10.dfsg.1.new/kdecore/kapplication.cpp
+--- kdelibs-3.5.10.dfsg.1/kdecore/kapplication.cpp	2008-08-19 20:18:18.000000000 +0200
++++ kdelibs-3.5.10.dfsg.1.new/kdecore/kapplication.cpp	2009-01-18 16:25:42.000000000 +0100
+@@ -2236,20 +2236,14 @@
+      url = QString("help:/%1/index.html").arg(appname);
+ 
+    QString error;
+-   if ( !dcopClient()->isApplicationRegistered("khelpcenter") )
+-   {
+-       if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, startup_id, false))
+-       {
+-           if (Tty != kapp->type())
+-               QMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+-               i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK"));
+-           else
+-               kdWarning() << "Could not launch help:\n" << error << endl;
+-	   return;
+-       }
+-   }
+-   else
+-       DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id );
++   // TODO this should check if cmd has a .desktop file, and use data from it, together
++   // with sending more ASN data
++   if (kdeinitExec("khelpcenter", url, &error, NULL, startup_id ))
++     if (Tty != kapp->type())
++       QMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
++             i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK"));
++     else
++       kdWarning() << "Could not launch help:\n" << error << endl;
+ }
+ #endif
+ 
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/12_cups_docroot.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/12_cups_docroot.diff
@@ -0,0 +1,25 @@
+--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ b/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
+--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ b/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.10.dfsg.1.orig/debian/patches/kubuntu_64_rosetta_translation.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_91_execute_feedback.diff
+++ kdelibs-3.5.10.dfsg.1/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*3);
++    }
++
++    // 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.10.dfsg.1.orig/debian/patches/63_fixed-layout-table.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/63_fixed-layout-table.diff
@@ -0,0 +1,24 @@
+Index: kdelibs/khtml/rendering/table_layout.cpp
+===================================================================
+--- kdelibs/khtml/rendering/table_layout.cpp	(revisión: 874967)
++++ kdelibs/khtml/rendering/table_layout.cpp	(revisión: 874968)
+@@ -297,7 +297,8 @@
+ #endif
+         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
+             if ( width[i].isPercent() ) {
+-                int w = base * width[i].value() / totalPercent;
++                // totalPercent may be 0 below if all %-width specifed are 0%. (#172557)
++                int w = totalPercent ? base * width[i].value() / totalPercent : 0;
+                 available -= w;
+                 calcWidth[i] = w;
+             }
+@@ -313,7 +314,8 @@
+ 
+         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
+             if ( width[i].isVariable() ) {
+-                int w = available / totalVariable;
++                // totalVariable may be 0 below if all the variable widths specified are 0.
++                int w = totalVariable ? available / totalVariable : 0;
+                 available -= w;
+                 calcWidth[i] = w;
+ 		totalVariable--;
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/56_kdepart_482268.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/56_kdepart_482268.diff
@@ -0,0 +1,48 @@
+--- a/kate/part/katesearch.cpp	
++++ b/kate/part/katesearch.cpp	
+@@ -377,23 +377,35 @@
+ {
+   QString replaceWith = m_replacement;
+   if ( s.flags.regExp && s.flags.useBackRefs ) {
+-    // replace each "(?!\)\d+" with the corresponding capture
+-    QRegExp br("\\\\(\\d+)");
++    // Replace each "\0"..."\9" with the corresponding capture,
++    // "\n" and "\t" with newline and tab,
++    // "\\" with "\",
++    // and remove the "\" for any other sequence.
++    QRegExp br("\\\\(.)");
+     int pos = br.search( replaceWith );
+     int ncaps = m_re.numCaptures();
+     while ( pos >= 0 ) {
+-      QString sc;
+-      if ( !pos ||  replaceWith.at( pos-1) != '\\' ) {
+-        int ccap = br.cap(1).toInt();
++      QString substitute;
++      QChar argument = br.cap(1).at(0);
++      if ( argument.isDigit() ) {
++        // the second character is a digit, this is a backreference
++        int ccap = argument.digitValue();
+         if (ccap <= ncaps ) {
+-          sc = m_re.cap( ccap );
+-          replaceWith.replace( pos, br.matchedLength(), sc );
+-        }
+-        else {
++          substitute = m_re.cap( ccap );
++        } else {
+           kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl;
++          break;
+         }
++      } else if ( argument == 'n' ) {
++        substitute = '\n';
++      } else if ( argument == 't' ) {
++        substitute = '\t';
++      } else {
++        // handle a validly escaped backslash, or an invalid escape.
++        substitute = argument;
+       }
+-      pos = br.search( replaceWith, pos + (int)sc.length() );
++      replaceWith.replace( pos, br.matchedLength(), substitute );
++      pos = br.search( replaceWith, pos + substitute.length() );
+     }
+   }
+ 
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/14_kaccel.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/14_kaccel.diff
@@ -0,0 +1,13 @@
+--- a/kdecore/kaccel.cpp
++++ b/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.10.dfsg.1.orig/debian/patches/62_fix_googlemaps_backport.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/62_fix_googlemaps_backport.diff
@@ -0,0 +1,39 @@
+backport fix for google maps
+
+--- kdelibs/khtml/ecma/kjs_dom.cpp	2007-05-14 09:52:40.000000000 +0200
++++ kdelibs/khtml/ecma/kjs_dom.cpp	2008-10-08 22:10:23.000000000 +0200
+@@ -335,26 +335,26 @@
+ 
+     switch (token) {
+     case OffsetLeft:
+-      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Number(0);
+     case OffsetTop:
+-      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Number(0);
+     case OffsetWidth:
+-      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Number(0);
+     case OffsetHeight:
+-      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Number(0);
+     case OffsetParent:
+     {
+       khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
+       return getDOMNode( exec, par ? par->element() : 0 );
+     }
+     case ClientWidth:
+-      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Number(0);
+     case ClientHeight:
+-      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Number(0);
+     case ScrollWidth:
+-      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Undefined();
++      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Number(0);
+     case ScrollHeight:
+-      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
++      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Number(0);
+     case ScrollLeft:
+       if (rend && rend->layer()) {
+           if (rend->isRoot() && !rend->style()->hidesOverflow())
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/44_sync_kwallet_changes.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/44_sync_kwallet_changes.diff
@@ -0,0 +1,106 @@
+--- a/kio/misc/kwalletd/kwalletd.cpp
++++ b/kio/misc/kwalletd/kwalletd.cpp
+@@ -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.10.dfsg.1.orig/debian/patches/kubuntu_05_icon_scale.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_55_printer_sharing.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_55_printer_sharing.diff
@@ -0,0 +1,34 @@
+--- kdelibs/kdeprint/management/kmmainview.h	2005-10-10 16:06:32.000000000 +0100
++++ kdelibs/kdeprint/management/kmmainview.h	2008-04-01 19:44:31.000000000 +0100
+@@ -78,6 +78,7 @@
+ 	void slotTest();
+ 	void slotServerRestart();
+ 	void slotServerConfigure();
++	void slotServerConfigureAccess();
+ 	void slotManagerConfigure();
+ 	void slotAddSpecial();
+ 	void slotRefresh();
+--- kdelibs/kdeprint/management/kmmainview.cpp	2005-11-08 22:39:38.000000000 +0000
++++ kdelibs/kdeprint/management/kmmainview.cpp	2008-04-01 19:49:38.000000000 +0100
+@@ -209,6 +209,7 @@
+ 
+ 	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");
++	new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,this,SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure");
+ 
+ 	KToggleAction	*tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
+ 	tact->setCheckedState(i18n("Hide &Toolbar"));
+@@ -691,6 +692,13 @@
+ 	}
+ }
+ 
++void KMMainView::slotServerConfigureAccess()
++{
++	KProcess *proc = new KProcess;
++	*proc << "/usr/bin/system-config-printer-kde";
++	proc->start(KProcess::DontCare);
++}
++
+ void KMMainView::slotToggleToolBar(bool on)
+ {
+ 	if (on) m_toolbar->show();
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/kubuntu_29_quiet_kbuildsycoca.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/kubuntu_97_automake_cleanup.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/kubuntu_97_automake_cleanup.diff
@@ -0,0 +1,1152 @@
+--- kdelibs-3.5.9.dfsg.1/arts/kde/Makefile.am	2005-09-10 11:26:36.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/arts/kde/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,7 +8,7 @@
+                         kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
+                         kvideowidget.cpp kplayobjectcreator.cc \
+                         kaudiomanagerplay.cpp
+-libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
++libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_KDECORE) -lkmedia2_idl -lartsflow $(LIB_KDEUI) $(LIB_X11)
+ libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+ libartskde_la_METASOURCES = AUTO
+ libartskde_la_COMPILE_FIRST = artskde.h
+--- kdelibs-3.5.9.dfsg.1/arts/knotify/Makefile.am	2007-01-15 13:34:07.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/arts/knotify/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ knotify_la_SOURCES	= knotify.cpp knotify.skel
+ if include_ARTS
+-knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la
++knotify_la_LIBADD	= -lsoundserver_idl $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) -lartsflow_idl -lmcop
+ endif
+ knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ knotify_la_METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/dcop/Makefile.am	2005-09-10 11:27:23.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/dcop/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -46,7 +46,7 @@
+ kdeinit_LTLIBRARIES = dcopserver.la
+ dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
+ dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD  = libDCOP.la
++dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
+ 
+ dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
+ 
+--- kdelibs-3.5.9.dfsg.1/dnssd/Makefile.am	2008-02-24 17:49:48.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/dnssd/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -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 $(AVAHI_LIBS)
++libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS) $(LIB_QT)
+ libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ 
+ #kde_kcfg_DATA = kcm_kdnssd.kcfg
+--- kdelibs-3.5.9.dfsg.1/interfaces/kimproxy/library/Makefile.am	2005-10-10 18:05:23.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/kimproxy/library/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ lib_LTLIBRARIES =  libkimproxy.la
+ libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+-libkimproxy_la_LIBADD = $(LIB_KIO)
++libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI)
+ libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
+ 
+ kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
+--- kdelibs-3.5.9.dfsg.1/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am	2005-09-10 11:26:30.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
+ 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)
++kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noinst_HEADERS = kfileaudiopreview.h
+ 
+--- kdelibs-3.5.9.dfsg.1/interfaces/kmediaplayer/Makefile.am	2005-09-10 11:26:30.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/kmediaplayer/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+ libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+-libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
++libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
+ libkmediaplayer_la_METASOURCES = AUTO
+ 
+ kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
+--- kdelibs-3.5.9.dfsg.1/interfaces/kscript/Makefile.am	2005-09-10 11:26:28.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/kscript/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ libkscript_la_SOURCES = scriptmanager.cpp
+ libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+-libkscript_la_LIBADD = $(LIB_KIO)
++libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+ kscriptincludedir = $(includedir)
+--- kdelibs-3.5.9.dfsg.1/interfaces/kscript/sample/Makefile.am	2005-09-10 11:26:28.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/kscript/sample/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ libshellscript_la_SOURCES = shellscript.cpp
+ libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
+-libshellscript_la_LIBADD = ../libkscript.la
++libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+ 
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/interfaces/ktexteditor/Makefile.am	2005-09-10 11:26:30.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/interfaces/ktexteditor/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ 
+ libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kabc/libkabc.la
++libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
+ 
+ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+                              selectioninterface.h cursorinterface.h \
+--- kdelibs-3.5.9.dfsg.1/kabc/formats/Makefile.am	2005-09-10 11:27:01.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/formats/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kabcformat_binary_la_SOURCES = binaryformat.cpp
+ kabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+                                 -no-undefined
+-kabcformat_binary_la_LIBADD  = $(top_builddir)/kabc/libkabc.la
++kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_KDECORE)
+ kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ 
+ # these are the headers for your project
+--- kdelibs-3.5.9.dfsg.1/kabc/Makefile.am	2006-05-22 21:14:18.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -22,7 +22,7 @@
+ lib_LTLIBRARIES = libkabc.la
+ 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
++                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
+ libkabc_la_COMPILE_FIRST = addressee.h
+ 
+ libkabc_la_SOURCES = \
+--- kdelibs-3.5.9.dfsg.1/kabc/plugins/dir/Makefile.am	2005-09-10 11:26:59.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/plugins/dir/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,13 +6,13 @@
+ 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 
+-libkabc_dir_la_LIBADD = $(LIB_KABC)
++libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+ 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
+-kabc_dir_la_LIBADD = libkabc_dir.la
++kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kabc/plugins/file/Makefile.am	2005-09-10 11:26:58.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/plugins/file/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,14 +6,14 @@
+ 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
+-libkabc_file_la_LIBADD = $(LIB_KABC)
++libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_KDECORE) $(LIB_KDEUI)
+ 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
+-kabc_file_la_LIBADD = libkabc_file.la
++kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_KDECORE)
+ kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kabc/plugins/ldapkio/Makefile.am	2005-09-10 11:26:58.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/plugins/ldapkio/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,13 +6,13 @@
+ 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
+-libkabc_ldapkio_la_LIBADD	= $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
++libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDEUI) $(LIB_KDECORE)
+ libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ 
+ kde_module_LTLIBRARIES = kabc_ldapkio.la
+ kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp
+ kabc_ldapkio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
+-kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la
++kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kabc/vcard/Makefile.am	2005-09-10 11:27:00.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kabc/vcard/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ libvcard_la_SOURCES = vCard-all.cpp
+ libvcard_la_LDFLAGS = $(all_libraries)
+-libvcard_la_LIBADD = $(LIB_KDECORE)
++libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+ check_PROGRAMS = testwrite testread
+ 
+--- kdelibs-3.5.9.dfsg.1/kate/interfaces/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/interfaces/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libkatepartinterfaces.la
+ 
+ libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
+-libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
++libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KDECORE)
+ libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ 
+ kateinclude_HEADERS = document.h view.h
+--- kdelibs-3.5.9.dfsg.1/kate/part/Makefile.am	2006-10-01 20:33:26.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/part/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ libkatepart_la_SOURCES = dummy.cpp
+ 
+-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(top_builddir)/kdeprint/libkdeprint.la $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS)
++libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_KDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+ 
+ libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+--- kdelibs-3.5.9.dfsg.1/kate/plugins/insertfile/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/plugins/insertfile/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = ktexteditor_insertfile.la
+ 
+ ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
+-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
++ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+ ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+           
+ insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
+--- kdelibs-3.5.9.dfsg.1/kate/plugins/isearch/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/plugins/isearch/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = ktexteditor_isearch.la
+ 
+ ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
+-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
++ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+           
+ isearchdatadir = $(kde_datadir)/ktexteditor_isearch
+--- kdelibs-3.5.9.dfsg.1/kate/plugins/kdatatool/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/plugins/kdatatool/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = ktexteditor_kdatatool.la
+ 
+ ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
+-ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
++ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+ ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
+--- kdelibs-3.5.9.dfsg.1/kate/plugins/wordcompletion/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kate/plugins/wordcompletion/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
+ 
+ ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
+-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
++ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
+--- kdelibs-3.5.9.dfsg.1/kcert/Makefile.am	2005-09-10 11:27:01.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kcert/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ libkcertpart_la_SOURCES	= kcertpart.cc
+ 
+ libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libkcertpart_la_LIBADD = $(LIB_KPARTS)
++libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KDECORE)
+ libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
+ 
+ libkcertpart_la_METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kcmshell/Makefile.am	2005-10-10 18:05:27.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kcmshell/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -26,7 +26,7 @@
+ kdeinit_LTLIBRARIES = kcmshell.la
+ 
+ kcmshell_la_SOURCES = main.cpp main.skel
+-kcmshell_la_LIBADD = ../kutils/libkutils.la
++kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+ kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ noinst_HEADERS = main.h
+--- kdelibs-3.5.9.dfsg.1/kconf_update/Makefile.am	2005-10-10 18:05:27.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kconf_update/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -23,7 +23,7 @@
+ kdeinit_LTLIBRARIES = kconf_update.la
+ 
+ kconf_update_la_SOURCES = kconf_update.cpp
+-kconf_update_la_LIBADD = $(LIB_KDECORE)
++kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kdecore/Makefile.am	2008-02-24 17:49:48.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/kdecore/Makefile.am	2008-02-24 17:37:52.000000000 +0200
+@@ -122,7 +122,8 @@
+ 	kqiodevicegzip_p.cpp ktimezones.cpp
+ 
+ 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_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
++	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libkdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+ libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
+ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
+ 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
+@@ -176,7 +177,6 @@
+ kgrantpty_SOURCES = kgrantpty.c
+ kgrantpty_CFLAGS= $(KDE_USE_FPIE)
+ kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
+-kgrantpty_LDADD = ./libkdefakes.la
+ 
+ # kgrantpty needs to be installed setuid root
+ install-exec-hook:
+--- kdelibs-3.5.9.dfsg.1/kded/Makefile.am	2005-10-10 18:06:29.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kded/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -23,11 +23,11 @@
+ kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
+ 
+ kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_la_LIBADD = $(LIB_KIO)
++kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+ kded_la_SOURCES = kded.cpp kdedmodule.cpp
+ 
+ kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kbuildsycoca_la_LIBADD = $(LIB_KIO)
++kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+ 				kbuildservicefactory.cpp \
+ 				kbuildservicegroupfactory.cpp \
+@@ -43,7 +43,7 @@
+ kdontchangethehostname_SOURCES = khostname.cpp
+ 
+ kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kde_menu_LDADD = $(LIB_KIO) 
++kde_menu_LDADD = $(LIB_KIO)
+ kde_menu_SOURCES = kde-menu.cpp
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kded_post/Makefile.am	1970-01-01 03:00:00.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kded_post/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -0,0 +1 @@
++SUBDIRS = ../kdeui/kdetrayproxy ../kio/kpasswdserver ../kio/misc
+--- kdelibs-3.5.9.dfsg.1/kdefx/Makefile.am	2005-10-10 18:05:27.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdefx/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ lib_LTLIBRARIES = libkdefx.la
+ 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_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
+ libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
+ libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
+ 	$(top_srcdir)/kdecore/standard_weak.nmcheck
+--- kdelibs-3.5.9.dfsg.1/kdeprint/cups/cupsdconf2/Makefile.am	2005-09-10 11:27:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/cups/cupsdconf2/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -15,7 +15,7 @@
+ 			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
+ cupsdconf_la_METASOURCES = AUTO
+ cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
+-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
++cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
+ 		 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
+--- kdelibs-3.5.9.dfsg.1/kdeprint/cups/Makefile.am	2006-10-02 13:46:55.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/cups/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -15,7 +15,7 @@
+ 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
+ 				  kptagspage.cpp
+ 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_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kdeprint_cups_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
+--- kdelibs-3.5.9.dfsg.1/kdeprint/ext/Makefile.am	2005-09-10 11:27:42.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/ext/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
+ kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kdeprint_ext_la_LIBADD = $(top_builddir)/kdeprint/libkdeprint.la
++kdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
+ kdeprint_ext_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
+--- kdelibs-3.5.9.dfsg.1/kdeprint/lpdunix/Makefile.am	2005-09-10 11:27:42.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/lpdunix/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
+ 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_LIBADD =  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
+ kdeprint_lpdunix_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
+--- kdelibs-3.5.9.dfsg.1/kdeprint/lpr/Makefile.am	2005-09-10 11:27:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/lpr/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -13,7 +13,8 @@
+ 			     lprngtoolhandler.cpp \
+ 			     editentrydialog.cpp
+ 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_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la \
++    $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
+ kdeprint_lpr_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = printcapreader.h \
+--- kdelibs-3.5.9.dfsg.1/kdeprint/Makefile.am	2005-09-10 11:27:43.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -11,7 +11,7 @@
+ kde_module_LTLIBRARIES = kded_kdeprintd.la
+ 
+ kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp
+-kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
++kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libkdeinit_kded.la
+ kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ #kded_kdeprintd_la_METASOURCES = AUTO
+ 
+@@ -30,7 +30,7 @@
+ 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
+ 
+ libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+-libkdeprint_la_LIBADD = $(LIB_KPARTS) $(LIBZ)
++libkdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+ libkdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
+ libkdeprint_la_METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kdeprint/management/Makefile.am	2005-09-10 11:27:42.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/management/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ bin_PROGRAMS = 
+ 
+ kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
+-kaddprinterwizard_la_LIBADD = libkdeprint_management.la
++kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
+ kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
+ 
+ libkdeprint_management_la_SOURCES = \
+@@ -26,12 +26,12 @@
+ 	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
+-libkdeprint_management_la_LIBADD = ../libkdeprint.la
++libkdeprint_management_la_LIBADD = ../libkdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ 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
+-libkdeprint_management_module_la_LIBADD = libkdeprint_management.la
++libkdeprint_management_module_la_LIBADD = libkdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
+ kdeprintdir = $(includedir)/kdeprint
+--- kdelibs-3.5.9.dfsg.1/kdeprint/rlpr/Makefile.am	2005-09-10 11:27:42.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/rlpr/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -7,7 +7,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
+-kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
++kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kdeprint_rlpr_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
+--- kdelibs-3.5.9.dfsg.1/kdeprint/tools/escputil/Makefile.am	2005-09-10 11:27:40.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/tools/escputil/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ 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
+-kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI)
++kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noinst_HEADERS = escpwidget.h
+ 
+--- kdelibs-3.5.9.dfsg.1/kdesu/Makefile.am	2007-01-15 13:34:13.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/kdesu/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ 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) 
+-libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIBUTIL)
++libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+ libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
+ libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
+ 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
+@@ -24,7 +24,7 @@
+ bin_PROGRAMS = kdesu_stub
+ kdesu_stub_SOURCES = kdesu_stub.c
+ kdesu_stub_LDFLAGS = $(all_libraries)
+-kdesu_stub_LDADD = ../kdecore/libkdefakes.la
++kdesu_stub_LDADD =
+ 
+ include $(top_srcdir)/admin/Doxyfile.am
+ 
+--- kdelibs-3.5.9.dfsg.1/kdeui/kdetrayproxy/Makefile.am	2005-09-10 11:27:45.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeui/kdetrayproxy/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -3,7 +3,7 @@
+ INCLUDES= -I$(top_srcdir)/kded $(all_includes)
+ kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
+ kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED)
++kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
+ 
+ METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kdeui/Makefile.am	2007-10-08 12:52:12.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeui/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -18,7 +18,8 @@
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+ 
+-SUBDIRS = . kdetrayproxy tests about
++SUBDIRS = . tests about
++DIST_SUBDIRS = kdetrayproxy
+ 
+ INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes)
+ 
+@@ -28,10 +29,9 @@
+ 
+ lib_LTLIBRARIES = libkdeui.la libkspell.la
+ libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+-libkdeui_la_LIBADD = ../kdecore/libkdecore.la
++libkdeui_la_LIBADD = ../kdecore/libkdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libkdefx.la $(LIB_XEXT)
+ 
+ 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
+--- kdelibs-3.5.9.dfsg.1/kdewidgets/Makefile.am	2005-10-10 18:05:44.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdewidgets/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ kde_widget_LTLIBRARIES = kdewidgets.la
+ kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC)
++kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
+ 
+ kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
+--- kdelibs-3.5.9.dfsg.1/kdoctools/Makefile.am	2008-02-24 17:49:48.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/kdoctools/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -11,11 +11,11 @@
+ 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 $(LIB_KIO) $(LIBBZ2)
++kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+ 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 $(LIB_KIO) $(LIBBZ2)
++kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+ kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ noinst_HEADERS = kio_help.h
+--- kdelibs-3.5.9.dfsg.1/khtml/java/Makefile.am	2005-09-10 11:27:16.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/khtml/java/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -32,6 +32,6 @@
+         kjavadownloader.cpp kjavaappletviewer.cpp
+ 
+ kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
+-kjavaappletviewer_la_LIBADD= $(LIB_KPARTS)
++kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+ 
+ kde_services_DATA= kjavaappletviewer.desktop
+--- kdelibs-3.5.9.dfsg.1/khtml/kmultipart/Makefile.am	2005-09-10 11:27:13.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/khtml/kmultipart/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkmultipart.la
+ 
+ libkmultipart_la_SOURCES = kmultipart.cpp
+-libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la
++libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBZ)
+ libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
+ libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+--- kdelibs-3.5.9.dfsg.1/khtml/Makefile.am	2007-01-15 13:34:06.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/khtml/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -57,7 +57,7 @@
+ 	$(LIBTHAI) \
+ 	$(top_builddir)/kdeprint/libkdeprint.la  \
+ 	$(top_builddir)/kutils/libkutils.la \
+-	$(top_builddir)/kwallet/client/libkwalletclient.la
++	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+ 
+ # init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
+ dummy.cpp: $(srcdir)/Makefile.am
+--- kdelibs-3.5.9.dfsg.1/kimgio/Makefile.am	2005-09-10 11:26:42.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kimgio/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -37,7 +37,7 @@
+ 
+ kimg_eps_la_SOURCES = eps.cpp
+ kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_eps_la_LIBADD  = $(LIB_KDECORE)
++kimg_eps_la_LIBADD  = $(LIB_KDECORE) $(LIB_QT)
+ 
+ kimg_ico_la_SOURCES = ico.cpp
+ kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+@@ -49,35 +49,35 @@
+ 
+ kimg_pcx_la_SOURCES = pcx.cpp
+ kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_pcx_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_pcx_la_LIBADD = $(LIB_QT)
+ 
+ kimg_tga_la_SOURCES = tga.cpp
+ kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_tga_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_tga_la_LIBADD = $(LIB_QT)
+ 
+ kimg_rgb_la_SOURCES = rgb.cpp
+ kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_rgb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_rgb_la_LIBADD = $(LIB_QT)
+ 
+ kimg_xcf_la_SOURCES = xcf.cpp
+ kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_xcf_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_xcf_la_LIBADD = $(LIB_QT)
+ 
+ kimg_exr_la_SOURCES = exr.cpp
+ kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_EXR)
++kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_EXR)
+ 
+ kimg_dds_la_SOURCES = dds.cpp
+ kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_dds_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_dds_la_LIBADD = $(LIB_QT)
+ 
+ kimg_psd_la_SOURCES = psd.cpp
+ kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_psd_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_psd_la_LIBADD = $(LIB_QT)
+ 
+ kimg_hdr_la_SOURCES = hdr.cpp
+ kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-kimg_hdr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++kimg_hdr_la_LIBADD = $(LIB_QT)
+ 
+ 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
+ 
+--- kdelibs-3.5.9.dfsg.1/kinit/Makefile.am	2007-10-08 12:52:03.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kinit/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -56,7 +56,7 @@
+ kwrapper_LDADD = $(LIBSOCKET)
+ 
+ klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-klauncher_la_LIBADD = $(LIB_KIO)
++klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+ klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
+ 
+ kstartupconfig_SOURCES  = kstartupconfig.cpp
+--- kdelibs-3.5.9.dfsg.1/kio/kpasswdserver/Makefile.am	2005-09-10 11:26:48.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/kpasswdserver/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -10,6 +10,6 @@
+ kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
+ kded_kpasswdserver_la_METASOURCES = AUTO
+ kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED)
++kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
+ 
+ include $(top_srcdir)/admin/Doxyfile.am
+--- kdelibs-3.5.9.dfsg.1/kio/Makefile.am	2005-10-10 18:05:44.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -20,7 +20,8 @@
+ 
+ INCLUDES=  -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
+ 
+-SUBDIRS = kssl kio bookmarks kfile . kpasswdserver misc pics tests kioexec httpfilter
++SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter
++DIST_SUBDIRS = kpasswdserver misc
+ 
+ lib_LTLIBRARIES = libkio.la
+ 
+@@ -32,7 +33,7 @@
+ 	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+ 	../kdeui/libkdeui.la ../kdesu/libkdesu.la \
+ 	../kwallet/client/libkwalletclient.la \
+-	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS)
++	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+ 
+ kde_mime_DATA = magic
+ kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
+--- kdelibs-3.5.9.dfsg.1/kio/misc/kdesasl/Makefile.am	2005-09-10 11:26:46.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/kdesasl/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,5 +8,5 @@
+ 
+ libkdesasl_la_SOURCES = kdesasl.cpp
+ libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
+-libkdesasl_la_LIBADD = $(LIB_KDECORE)
++libkdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+--- kdelibs-3.5.9.dfsg.1/kio/misc/kntlm/Makefile.am	2005-09-10 11:26:46.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/kntlm/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,5 +8,5 @@
+ 
+ libkntlm_la_SOURCES = kntlm.cpp des.cpp
+ libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
+-libkntlm_la_LIBADD = $(LIB_KDECORE)
++libkntlm_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+--- kdelibs-3.5.9.dfsg.1/kio/misc/kpac/Makefile.am	2005-09-10 11:26:47.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/kpac/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -10,7 +10,9 @@
+ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
+                              downloader.cpp discovery.cpp
+ kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED)
++kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
++	$(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la \
++	$(LIB_KDECORE) $(LIBRESOLV)
+ 
+ kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
+ kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
+--- kdelibs-3.5.9.dfsg.1/kio/misc/kssld/Makefile.am	2005-10-10 18:05:43.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/kssld/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -21,7 +21,7 @@
+ kde_module_LTLIBRARIES = kded_kssld.la
+ 
+ kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
++kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la $(LIB_KDECORE)
+ kded_kssld_la_SOURCES = kssld.cpp kssld.skel
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kio/misc/kwalletd/Makefile.am	2005-10-10 18:05:43.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/kwalletd/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -21,7 +21,7 @@
+ kde_module_LTLIBRARIES = kded_kwalletd.la
+ 
+ kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED)
++kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
+ kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kio/misc/Makefile.am	2005-10-10 18:05:43.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kio/misc/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -29,7 +29,7 @@
+ observer_DIR = $(top_srcdir)/kio/kio
+ 
+ kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
+-kio_uiserver_la_LIBADD = $(LIB_KIO)
++kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+ kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kioslave/bzip2/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/bzip2/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kbzip2filter.la
+ 
+ kbzip2filter_la_SOURCES = kbzip2filter.cpp
+-kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
++kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+ kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ kde_services_DATA = kbzip2filter.desktop
+--- kdelibs-3.5.9.dfsg.1/kioslave/file/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/file/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -9,7 +9,7 @@
+ kde_module_LTLIBRARIES = kio_file.la
+ 
+ kio_file_la_SOURCES = file.cc
+-kio_file_la_LIBADD = $(LIB_KIO)
++kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(ACL_LIBS)
+ kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
+ noinst_HEADERS = file.h
+ 
+--- kdelibs-3.5.9.dfsg.1/kioslave/ftp/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/ftp/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = kio_ftp.la
+ 
+ kio_ftp_la_SOURCES = ftp.cc
+-kio_ftp_la_LIBADD  = $(LIB_KIO)
++kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
+ 
+ noinst_HEADERS = ftp.h
+--- kdelibs-3.5.9.dfsg.1/kioslave/gzip/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/gzip/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = kgzipfilter.la
+ 
+ kgzipfilter_la_SOURCES = kgzipfilter.cpp
+-kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ)
++kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_KDECORE)
+ kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ kde_services_DATA = kgzipfilter.desktop
+--- kdelibs-3.5.9.dfsg.1/kioslave/http/kcookiejar/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/http/kcookiejar/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -13,12 +13,12 @@
+ kcookiejar_la_SOURCES = main.cpp
+ METASOURCES = AUTO
+ kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kcookiejar_la_LIBADD = $(LIB_KDECORE)
++kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+ 
+ kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
+ 			kcookieserver.skel kcookiewin.cpp 
+ kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_kcookiejar_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
++kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
+ 
+ kded_DATA = kcookiejar.desktop
+ kdeddir = $(kde_servicesdir)/kded
+--- kdelibs-3.5.9.dfsg.1/kioslave/http/Makefile.am	2005-10-10 18:05:36.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/http/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -15,11 +15,11 @@
+ 
+ kio_http_la_SOURCES = http.cc
+ kio_http_la_METASOURCES = AUTO
+-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
+-kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
++kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la $(LIB_QT) $(LIB_KDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la
++kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) -lgssapi_krb5
+ 
+ kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
+-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO)
++kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+ kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
+ 
+ noinst_HEADERS = http.h
+--- kdelibs-3.5.9.dfsg.1/kioslave/metainfo/Makefile.am	2005-09-10 11:26:41.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kioslave/metainfo/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ kde_module_LTLIBRARIES = kio_metainfo.la
+ 
+ kio_metainfo_la_SOURCES = metainfo.cpp
+-kio_metainfo_la_LIBADD = $(LIB_KIO)
++kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ noinst_HEADERS = metainfo.h 
+--- kdelibs-3.5.9.dfsg.1/kmdi/kmdi/Makefile.am	2005-09-10 11:26:30.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kmdi/kmdi/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ lib_LTLIBRARIES = libkmdi2.la
+ libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
+-libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
++libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
+ 
+--- kdelibs-3.5.9.dfsg.1/kmdi/Makefile.am	2005-09-10 11:26:31.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kmdi/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ lib_LTLIBRARIES = libkmdi.la
+ libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
+-libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
++libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
+ 
+ libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
+                      kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
+--- kdelibs-3.5.9.dfsg.1/knewstuff/Makefile.am	2005-09-10 11:27:02.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/knewstuff/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ lib_LTLIBRARIES = libknewstuff.la
+ 
+ libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+-libknewstuff_la_LIBADD  = $(LIB_KIO)
++libknewstuff_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
+   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
+   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
+--- kdelibs-3.5.9.dfsg.1/kparts/Makefile.am	2005-09-10 11:27:40.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kparts/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -5,7 +5,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
+-libkparts_la_LIBADD  = $(LIB_KIO)
++libkparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+ 
+ check-local:
+ 	(cd tests && $(MAKE) check )
+--- kdelibs-3.5.9.dfsg.1/kresources/Makefile.am	2005-09-10 11:27:21.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kresources/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -15,7 +15,7 @@
+   configpage.cpp
+ 
+ libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+-libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
++libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+ 
+ kresincludedir = $(includedir)/kresources
+ kresinclude_HEADERS = resource.h \
+@@ -32,7 +32,7 @@
+ 
+ kcm_kresources_la_SOURCES = kcmkresources.cpp
+ kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_kresources_la_LIBADD = libkresources.la
++kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ 
+ check_PROGRAMS = testresources
+--- kdelibs-3.5.9.dfsg.1/kspell2/plugins/aspell/Makefile.am	2005-09-10 11:27:02.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kspell2/plugins/aspell/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -11,7 +11,7 @@
+ kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
+ 
+ kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell
++kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_KDECORE)
+ 
+ service_DATA = kspell_aspell.desktop
+ servicedir = $(kde_servicesdir)
+--- kdelibs-3.5.9.dfsg.1/kspell2/plugins/hspell/Makefile.am	2005-09-10 11:27:02.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kspell2/plugins/hspell/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -11,7 +11,7 @@
+ kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
+ 
+ kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz
++kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_KDECORE)
+ 
+ service_DATA = kspell_hspell.desktop
+ servicedir = $(kde_servicesdir)
+--- kdelibs-3.5.9.dfsg.1/kspell2/plugins/ispell/Makefile.am	2005-09-10 11:27:02.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kspell2/plugins/ispell/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ 	ispell_checker.cpp
+ 
+ kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la 
++kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_KDECORE)
+ 
+ service_DATA = kspell_ispell.desktop
+ servicedir = $(kde_servicesdir)
+--- kdelibs-3.5.9.dfsg.1/kspell2/ui/Makefile.am	2008-02-24 17:49:48.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/kspell2/ui/Makefile.am	2008-02-24 16:51:30.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 $(LIB_KPARTS) ../../kutils/libkutils.la 
++libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE)
+--- kdelibs-3.5.9.dfsg.1/kstyles/highcolor/Makefile.am	2005-10-10 18:05:52.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/highcolor/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -24,6 +24,6 @@
+ noinst_HEADERS = highcolor.h bitmaps.h
+ kde_style_LTLIBRARIES = highcolor.la
+ highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-highcolor_la_LIBADD = ../../kdefx/libkdefx.la
++highcolor_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+ highcolor_la_SOURCES = highcolor.cpp
+ highcolor_la_METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kstyles/highcontrast/config/Makefile.am	2005-09-10 11:26:58.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/highcontrast/config/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -3,7 +3,7 @@
+ noinst_HEADERS = highcontrastconfig.h
+ kde_module_LTLIBRARIES = kstyle_highcontrast_config.la
+ kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kstyle_highcontrast_config_la_LIBADD  = $(LIB_KDEUI)
++kstyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE)
+ kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
+ kstyle_highcontrast_config_la_METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kstyles/highcontrast/Makefile.am	2005-10-10 18:05:52.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/highcontrast/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -35,7 +35,7 @@
+ kde_style_LTLIBRARIES = highcontrast.la
+ highcontrast_la_SOURCES = highcontrast.cpp
+ highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-highcontrast_la_LIBADD = ../../kdefx/libkdefx.la
++highcontrast_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+ highcontrast_la_METASOURCES = AUTO
+ 
+ DISTCLEANFILES = $(highcontrast_la_METASOURCES)
+--- kdelibs-3.5.9.dfsg.1/kstyles/keramik/Makefile.am	2005-09-10 11:26:57.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/keramik/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -6,7 +6,7 @@
+ noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
+ kde_style_LTLIBRARIES = keramik.la
+ keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-keramik_la_LIBADD = ../../kdefx/libkdefx.la
++keramik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) $(LIB_XEXT)
+ keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp
+ keramik_la_COMPILE_FIRST = keramikrc.h
+ keramik_la_METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kstyles/kthemestyle/Makefile.am	2005-10-10 18:05:52.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/kthemestyle/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -24,6 +24,6 @@
+ noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
+ kde_style_LTLIBRARIES = kthemestyle.la
+ kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la  ../../kdecore/libkdecore.la
++kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la  ../../kdecore/libkdecore.la -ldl $(LIB_QT)
+ kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
+ kthemestyle_la_METASOURCES = AUTO
+--- kdelibs-3.5.9.dfsg.1/kstyles/plastik/config/Makefile.am	2005-09-10 11:26:58.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/plastik/config/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -3,7 +3,7 @@
+ noinst_HEADERS = plastikconf.h
+ kde_module_LTLIBRARIES = kstyle_plastik_config.la
+ kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kstyle_plastik_config_la_LIBADD  = $(LIB_KDEUI)
++kstyle_plastik_config_la_LIBADD  = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ kstyle_plastik_config_la_SOURCES = plastikconf.cpp
+ kstyle_plastik_config_la_METASOURCES = AUTO
+ 
+--- kdelibs-3.5.9.dfsg.1/kstyles/plastik/Makefile.am	2005-09-10 11:26:58.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/plastik/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -16,7 +16,7 @@
+ kde_style_LTLIBRARIES = plastik.la
+ plastik_la_SOURCES = plastik.cpp misc.cpp
+ plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-plastik_la_LIBADD = ../../kdefx/libkdefx.la
++plastik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+ plastik_la_METASOURCES = AUTO
+ 
+ DISTCLEANFILES = $(plastik_la_METASOURCES)
+--- kdelibs-3.5.9.dfsg.1/kstyles/utils/installtheme/Makefile.am	2005-09-10 11:26:52.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kstyles/utils/installtheme/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -14,5 +14,5 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-kinstalltheme_LDADD   = $(LIB_KDEUI)
++kinstalltheme_LDADD = $(LIB_QT) $(LIB_KDECORE)
+ 
+--- kdelibs-3.5.9.dfsg.1/kunittest/Makefile.am	2005-10-10 18:05:27.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kunittest/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ lib_LTLIBRARIES = libkunittest.la
+ libkunittest_la_SOURCES = runner.cpp tester.cpp
+ libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
+-libkunittest_la_LIBADD = $(LIB_KDECORE)
++libkunittest_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ 
+ libkunittestinclude_HEADERS = runner.h tester.h module.h
+ libkunittestincludedir = $(includedir)/kunittest
+--- kdelibs-3.5.9.dfsg.1/kutils/Makefile.am	2005-09-10 11:27:02.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kutils/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ lib_LTLIBRARIES   = libkutils.la
+ 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_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
+ 
+ libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
+                        kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \
+--- kdelibs-3.5.9.dfsg.1/kwallet/client/Makefile.am	2005-09-10 11:27:01.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kwallet/client/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ lib_LTLIBRARIES = libkwalletclient.la
+ 
+ libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
+-libkwalletclient_la_LIBADD = $(LIB_KDECORE)
++libkwalletclient_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+ libkwalletclient_la_SOURCES =   kwallet.skel \
+ 				kwallet.cc
+ 
+--- kdelibs-3.5.9.dfsg.1/libkmid/Makefile.am	2005-09-10 11:27:49.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/libkmid/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ 	libkmid.cc
+ 
+ libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+-libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la
++libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la $(LIB_QT)
+ 
+ DOXYGEN_REFERENCES = kdecore
+ include ../admin/Doxyfile.am
+--- kdelibs-3.5.9.dfsg.1/libkscreensaver/Makefile.am	2005-09-10 11:26:28.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/libkscreensaver/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = libkscreensaver.la
+ libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
+-libkscreensaver_la_LIBADD  = $(LIB_KIO)
++libkscreensaver_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
+ if undefined_symbols_allowed
+ libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
+ else
+--- kdelibs-3.5.9.dfsg.1/Makefile.am	2008-02-13 17:26:30.000000000 +0200
++++ kdelibs-3.5.9.dfsg.1/Makefile.am	2008-02-24 17:19:18.000000000 +0200
+@@ -18,7 +18,7 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio
++COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
+ # COMPILE_BEFORE_doc = kdoctools
+ # COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml
+ # COMPILE_AFTER_kdeprint = kate khtml
+--- kdelibs-3.5.9.dfsg.1/Makefile.am.in	2006-10-01 20:33:45.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/Makefile.am.in	2008-02-24 16:51:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio
++COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
+ COMPILE_BEFORE_doc = kdoctools
+ COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml
+ COMPILE_AFTER_kdeprint = kate khtml
+--- kdelibs-3.5.9.dfsg.1/pics/Makefile.am	2005-09-10 11:27:32.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/pics/Makefile.am	2008-02-24 16:51:30.000000000 +0200
+@@ -9,7 +9,7 @@
+ bin_PROGRAMS = $(KSVGTOPNG)
+ 
+ ksvgtopng_SOURCES = ksvgtopng.cpp
+-ksvgtopng_LDADD =  $(LIBART_LIBS) $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la
++ksvgtopng_LDADD =  $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la
+ ksvgtopng_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ install-data-local:
+--- kdelibs-3.5.9.dfsg.1/kdeprint/configure.in.in	2005-09-10 11:27:43.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kdeprint/configure.in.in	2008-02-24 17:07:18.000000000 +0200
+@@ -51,10 +51,11 @@
+   ac_LDFLAGS_save="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $all_libraries"
+   kde_cups_config=
+-  kde_cups_libs="-lcups $LIBDL $LIBSOCKET"
++  kde_cups_libs="-lcups"
+   AC_PATH_PROG(kde_cups_config,cups-config)
+   if test -n "$kde_cups_config"; then
+-    kde_cups_libs=`$kde_cups_config --libs`
++#    kde_cups_libs=`$kde_cups_config --libs`
++    kde_cups_libs="$kde_cups_libs"
+   else
+     AC_MSG_RESULT(cups-config not found, using default libraries: $kde_cups_libs. You should consider upgrading CUPS)
+   fi
+--- kdelibs-3.5.9.dfsg.1/kjs/configure.in.in	2007-10-08 12:52:09.000000000 +0300
++++ kdelibs-3.5.9.dfsg.1/kjs/configure.in.in	2008-02-24 17:07:18.000000000 +0200
+@@ -52,10 +52,10 @@
+ 
+     KDE_FIND_PATH(pcre-config, PCRE_CONFIG, [${exec_prefix}/bin ${prefix}/bin], [PCRE_CONFIG="" ])
+     if test -n "$PCRE_CONFIG" && $PCRE_CONFIG --libs >/dev/null 2>&1; then
+-        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,,"`
++        LIBPCRE=`$PCRE_CONFIG --libs-posix | sed -e "s,-L/usr/lib ,," -e "s,[\b-].\+pcreposix[^[:space:]]*\b,,"`
+         PCRECFLAGS=`$PCRE_CONFIG --cflags`
+     else
+-        LIBPCRE="-lpcre -lpcreposix"
++        LIBPCRE="-lpcre"
+         PCRECFLAGS=
+             fi
+                 AC_CACHE_VAL(ac_cv_have_pcreposix, [
--- kdelibs-3.5.10.dfsg.1.orig/debian/patches/common/06_disable_no_undefined.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/kubuntu_01_kdepot.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/README
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/kde.pot
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/04_am_maintainer_mode.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/05_pedantic-errors.diff
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/patches/common/update.sh
+++ kdelibs-3.5.10.dfsg.1/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.10
+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.10.dfsg.1.orig/debian/patches/common/03_libtool_update.diff
+++ kdelibs-3.5.10.dfsg.1/debian/patches/common/03_libtool_update.diff
@@ -0,0 +1,8684 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2007-10-08 13:34:50.000000000 +0200
++++ b/admin/libtool.m4.in	2008-01-21 23:31:58.000000000 +0100
+@@ -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, 2006, 2007
+ ## 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 51 Debian 1.5.24-2 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"
+@@ -184,22 +170,24 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ 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,58 @@
+ # 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_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$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_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$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
+@@ -254,12 +289,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+@@ -317,15 +360,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
+@@ -490,18 +533,21 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # 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-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,8 +559,10 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -547,6 +595,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)
+@@ -570,7 +634,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -578,7 +642,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 +652,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
+@@ -609,17 +675,23 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$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 +715,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,24 +744,77 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
+-    # 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` &&
+-	    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
+-    done
+-    testring=
+-    # 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.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++  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
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      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`
++    else
++      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`
++        teststring=$teststring$teststring
++      done
++      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.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ ])
+@@ -702,7 +827,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +835,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 +901,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 +925,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 +962,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -869,7 +996,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 +1009,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(
+@@ -914,7 +1041,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -922,14 +1050,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -937,7 +1058,7 @@
+    # 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 +1070,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 +1140,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 &&
+@@ -1064,6 +1190,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+@@ -1072,7 +1199,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1081,11 +1208,12 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1223,58 @@
+ 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"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_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.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1339,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 +1348,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 +1364,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1376,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 +1407,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,13 +1430,9 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -1273,20 +1449,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 +1477,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
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -1331,9 +1509,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 +1526,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 +1537,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 +1549,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[[3-9]]*)
++  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 +1604,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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;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 +1633,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 +1654,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 +1682,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 +1708,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,11 +1726,8 @@
+   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
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -1554,7 +1755,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 +1788,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,13 +1824,19 @@
+ 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
+ 
+ 
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+@@ -1624,6 +1854,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 +1883,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 +1947,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 +1985,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)
+@@ -1862,7 +2097,7 @@
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -1886,7 +2121,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
+@@ -1925,7 +2160,7 @@
+ 
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -1996,7 +2231,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 +2263,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 +2290,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
+ 
+ 
+@@ -2063,7 +2307,7 @@
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2088,44 +2332,42 @@
+   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',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ 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 +2383,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 +2399,27 @@
+   esac
+   ;;
+ 
++interix[[3-9]]*)
++  # 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 +2438,26 @@
+   ;;
+ 
+ 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*)
++rdos*)
+   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 +2478,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 +2504,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 +2572,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 +2597,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 +2641,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 +2695,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2480,43 +2721,16 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ _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 +2744,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 +2755,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 +2764,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 +2793,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 +2805,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,21 +2823,25 @@
+ _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
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # 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); }'
+ 
+ # 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 +2852,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 +2881,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 +2908,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,13 +2938,28 @@
+       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
+ 
+-    # When large executables or shared objects are built, AIX ld can
++      # 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
+     # or program results in "error TOC overflow" add -mminimal-toc to
+     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+@@ -2774,7 +2971,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`
+@@ -2782,7 +2979,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -2793,8 +2990,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 +3004,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 +3022,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 +3036,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 +3069,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 +3083,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'
++    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
+-	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
++          _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` $xlcverstring'
++          _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 $xlcverstring~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
+-      ;;
+-    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
+-    ;;
++        ;;
+ 
+   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 +3168,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 +3192,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 +3206,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 +3220,20 @@
+     ;;
+   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_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)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
+       *)
+-	_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 +3244,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 +3273,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 +3292,25 @@
+ 	;;
+     esac
+     ;;
++  interix[[3-9]]*)
++    _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 +3321,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 +3332,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 +3359,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'
+@@ -3159,6 +3412,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _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)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  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
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -3171,7 +3447,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3457,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 +3468,35 @@
+     # 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*)
++    if test -f /usr/libexec/ld.so; then
++      _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'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
+   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 +3506,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 +3531,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 +3550,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 +3565,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 +3594,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 +3615,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 +3635,28 @@
+     ;;
+   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.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # 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)='-z allextract$convenience -z 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 +3664,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 +3676,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 +3687,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
+@@ -3423,16 +3698,73 @@
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     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 +3801,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 +3818,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 +3872,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 +3912,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 +3948,70 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # 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)=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
++    # 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.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  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'.
+@@ -3660,20 +4047,31 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # 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 +4081,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 +4089,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 +4102,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 +4111,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)
+ 
+@@ -3740,23 +4136,30 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # 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) {}; }'
+ 
+ # 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 +4171,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 +4180,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'.
+@@ -3795,7 +4196,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -3803,11 +4204,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 +4239,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 \
+@@ -3878,6 +4285,7 @@
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+@@ -3887,7 +4295,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 | \
+@@ -3924,7 +4332,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -3953,11 +4361,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 +4396,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 +4413,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 +4435,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 +4466,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4481,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?
+@@ -4240,7 +4657,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -4293,7 +4710,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
+ 
+@@ -4320,6 +4740,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -4335,9 +4756,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 +4777,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 +4818,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
+@@ -4530,12 +4967,14 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -4547,6 +4986,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix[[3-9]]*)
++      # 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 +4998,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 +5023,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 +5052,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 +5080,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 +5095,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.
+@@ -4659,6 +5122,14 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _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 '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -4668,25 +5139,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 +5171,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 +5189,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 +5204,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4750,7 +5212,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*)
+ 	;;
+@@ -4781,13 +5250,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+@@ -4797,6 +5268,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix[[3-9]]*)
++      # 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 +5289,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,8 +5315,18 @@
+ 	_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*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -4850,7 +5336,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,18 +5359,41 @@
+       _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.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _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)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _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)=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -4894,15 +5403,19 @@
+       _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'
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     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 +5424,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 +5437,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 +5475,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 +5484,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)=])
+ ])
+ 
+ 
+@@ -4967,7 +5501,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -4984,7 +5519,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 +5548,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 +5565,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 +5576,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 +5590,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 +5648,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 +5658,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/'\'' -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 +5673,79 @@
+ 	  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
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    interix[[3-9]]*)
++      _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'
++      ;;
++
++    gnu* | 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
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    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 +5759,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 +5802,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 +5826,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 +5848,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 +5879,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`
+@@ -5233,7 +5887,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5244,8 +5898,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 +5911,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 +5943,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 +5960,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5970,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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _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` $xlcverstring'
++         _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 $xlcverstring~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 +6065,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 +6074,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 +6088,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 +6157,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 +6167,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
+@@ -5516,23 +6187,28 @@
+       ;;
+ 
+     openbsd*)
+-      _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	_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 $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
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _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
++        fi
+       else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+@@ -5540,14 +6216,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 +6235,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 +6249,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 +6266,17 @@
+       _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 and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +6285,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 +6333,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* | 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
+-      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 +6389,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?
+ #
+@@ -5725,14 +6408,15 @@
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++      echo "$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=
+@@ -5827,6 +6511,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+ 
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+@@ -5849,18 +6557,19 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # 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
+@@ -5887,5 +6596,6 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2007-10-08 13:34:50.000000000 +0200
++++ b/admin/ltmain.sh	2008-01-21 23:31:58.000000000 +0100
+@@ -1,8 +1,8 @@
+ # 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
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007  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
+@@ -24,6 +24,42 @@
+ # 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.24 Debian 1.5.24-2"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +72,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 +81,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 +96,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
+ 
+@@ -86,20 +113,24 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+-  save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++	  save_$lt_var=\$$lt_var
++	  $lt_var=C
++	  export $lt_var
++	fi"
++done
+ 
+ # 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,17 +142,62 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+ 
+ #####################################
+ # 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 +206,22 @@
+     ;;
+   *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 +235,191 @@
+   $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_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
++
++      $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 +439,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 +455,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
+@@ -218,26 +482,28 @@
+     ;;
+ 
+   --version)
+-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    $echo
+-    $echo "Copyright (C) 2003  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
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    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 +522,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,13 +534,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 +557,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,9 +570,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 +595,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 +638,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 +653,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 +680,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 +705,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 +743,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 +758,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.
+@@ -500,9 +784,10 @@
+     *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+-    *.f90) xform=f90 ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
+     *.for) xform=for ;;
+     *.java) xform=java ;;
++    *.obj) xform=obj ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -511,51 +796,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 +841,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 +852,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 +871,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 +881,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 +899,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 +933,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 +959,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 +979,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 +1000,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 +1016,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 +1031,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +1051,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1089,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1115,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1127,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1147,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,26 +1162,38 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+       case $arg in
+-      -all-static | -static)
+-	if test "X$arg" = "X-all-static"; then
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+-	else
++	  prefer_static_libs=yes
++	  ;;
++	-static)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+-	fi
++	  prefer_static_libs=built
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -912,7 +1205,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 +1268,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 +1283,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1320,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 +1368,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 +1399,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 +1411,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 +1451,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 +1511,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 +1521,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 +1559,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 +1574,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 +1591,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 +1629,42 @@
+ 	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|-threads)
++	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
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++
+ 	# 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 +1675,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
+         ;;
+ 
+@@ -1341,9 +1691,9 @@
+ 
+       -no-install)
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # in order for the loader to find any dlls it needs.
++	  # and Darwin in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+@@ -1365,6 +1715,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1742,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1397,7 +1752,7 @@
+ 	continue
+ 	;;
+ 
+-      -static)
++      -static | -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+@@ -1473,11 +1828,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1838,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1865,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 +1913,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 +1977,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1990,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 +2023,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 +2034,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 +2044,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 +2088,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 +2096,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +2122,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 +2137,23 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	  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 +2214,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 +2229,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 +2261,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 +2326,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 +2350,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2359,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 +2369,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 +2402,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 +2450,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 +2470,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 +2497,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2207,14 +2533,16 @@
+ 
+ 	if test "$linkmode,$pass" = "prog,link"; then
+ 	  if test -n "$library_names" &&
+-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       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 +2579,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 +2659,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 +2673,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 +2697,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 +2713,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 +2736,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 +2755,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 +2798,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 +2809,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 +2870,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 +2893,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2935,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 +2954,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 +3079,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 +3140,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 +3163,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 +3211,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"
+@@ -2903,7 +3231,7 @@
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+-	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|none)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+@@ -2914,9 +3242,15 @@
+ 	    age="0"
+ 	    ;;
+ 	  irix|nonstopux)
+-	    current=`expr $number_major + $number_minor - 1`
++	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
++	    lt_irix_increment=no
++	    ;;
++	  *)
++	    $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
+ 	  ;;
+@@ -2929,36 +3263,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,6 +3309,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+@@ -2989,8 +3324,11 @@
+ 	  ;;
+ 
+ 	irix | nonstopux)
+-	  major=`expr $current - $age + 1`
+-
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+@@ -3047,7 +3385,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 +3436,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"
+ 	       ;;
+ 	    *) ;;
+@@ -3121,11 +3465,11 @@
+       fi
+ 
+       # 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'`
+-      done
++      #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"`
++      #done
+ 
+       if test -n "$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+@@ -3137,7 +3481,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 +3514,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,13 +3570,12 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
+-	  if test "$?" -eq 0 ; then
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; 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 "$name" != "" && test "$name" != "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		  case " $predeps $postdeps " in
+ 		  *" $i "*)
+@@ -3262,13 +3610,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
+-		# Did it work?
+-		if test "$?" -eq 0 ; then
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ 		  ldd_output=`ldd conftest`
+ 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		    case " $predeps $postdeps " in
+@@ -3300,7 +3646,7 @@
+ 		  droppeddeps=yes
+ 		  $echo
+ 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** make it link in!  You will probably need to install it or some"
+ 		  $echo "*** library that it depends on before this library will be fully"
+ 		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+@@ -3314,7 +3660,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 +3729,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 +3809,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 +3855,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 +3900,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
+@@ -3564,7 +3932,10 @@
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
+ 	    else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+@@ -3587,7 +3958,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 +3974,7 @@
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
++	linknames=
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+@@ -3617,10 +3989,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 +4003,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 +4026,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 +4039,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 +4056,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 +4095,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 +4105,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 +4125,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 +4147,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 +4178,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 +4273,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"`
+@@ -3949,72 +4294,20 @@
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ 	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 +4315,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 +4332,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4345,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 +4368,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,24 +4393,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 +4481,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 +4603,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 +4672,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 +4738,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" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            else
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            ;;
++          esac
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4403,30 +4773,19 @@
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+       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'`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ 	link_command="$compile_command$compile_rpath"
+ 
+ 	# 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 +4793,7 @@
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+-	exit $status
++	exit $exit_status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+@@ -4493,7 +4852,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
+@@ -4507,7 +4866,7 @@
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+@@ -4544,14 +4903,14 @@
+ 	  fi
+ 	done
+ 	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       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 +4932,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 +4947,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 +4963,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 +4976,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 +4998,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 +5032,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 +5090,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;
++}
++
++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;
+ }
+ 
+-char * 
+-fnqualify(const char *path)
++/* 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 +5262,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 +5282,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
+@@ -4805,9 +5310,23 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # 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 +5405,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5455,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
++      \$echo \"\$0: cannot exec \$program \$*\"
++      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 +5503,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 +5583,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 +5602,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 +5613,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 +5651,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       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 +5675,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 +5689,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 +5700,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 +5767,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 +5780,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5791,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 +5804,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 +5829,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 +5862,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5872,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 +5888,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 +5909,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 +5921,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 +5950,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,14 +5992,14 @@
+ 	  # 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
+ 	    # Stick the inst_prefix_dir data into the link command.
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ 	  else
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ 	  fi
+ 
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5478,7 +6007,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 +6031,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 +6098,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +6116,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +6154,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,34 +6190,25 @@
+ 	  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.
+-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+@@ -5697,7 +6228,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 +6260,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 +6284,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 +6305,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 +6326,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 +6361,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 +6374,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 +6382,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 +6393,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.
+@@ -5886,8 +6419,10 @@
+ 	if test -f "$dir/$objdir/$dlname"; then
+ 	  dir="$dir/$objdir"
+ 	else
+-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 	fi
+ 	;;
+ 
+@@ -5951,12 +6486,12 @@
+       fi
+ 
+       # Restore saved environment variables
+-      if test "${save_LC_ALL+set}" = set; then
+-	LC_ALL="$save_LC_ALL"; export LC_ALL
+-      fi
+-      if test "${save_LANG+set}" = set; then
+-	LANG="$save_LANG"; export LANG
+-      fi
++      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+@@ -5967,7 +6502,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6530,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 +6580,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 +6609,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 +6623,8 @@
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+@@ -6107,7 +6653,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 +6698,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 +6747,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6302,9 +6848,9 @@
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+-		    try to export only the symbols listed in SYMFILE
++                    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+-		    try to export only the symbols matching REGEX
++                    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+@@ -6313,12 +6859,16 @@
+   -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
+-  -static           do not do any dynamic linking of libtool libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+-		    specify library version info [each variable defaults to 0]
++                    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+@@ -6354,14 +6904,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 +6925,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.10.dfsg.1.orig/debian/kubuntu-desktop-i18n/findfiles
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/debian/kubuntu-desktop-i18n/msgsplit
+++ kdelibs-3.5.10.dfsg.1/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.10.dfsg.1.orig/kspell2/kspellclient.desktop
+++ kdelibs-3.5.10.dfsg.1/kspell2/kspellclient.desktop
@@ -70,3 +70,4 @@
 Comment[wa]=Cliyint KSpell
 Comment[zh_CN]=KSpell 客户
 Comment[zh_TW]=KShell 客戶端程式
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -53,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
@@ -144,6 +142,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -286,6 +285,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -295,6 +295,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -323,6 +324,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -373,6 +375,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -430,6 +433,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -452,7 +456,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)
 #>- all: all-recursive
@@ -461,12 +464,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -477,8 +480,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -499,9 +502,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:
@@ -666,7 +669,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -980,18 +983,18 @@
 .NOEXPORT:
 
 #>+ 3
-defaultdictionary.moc: $(srcdir)/defaultdictionary.h
-	$(MOC) $(srcdir)/defaultdictionary.h -o defaultdictionary.moc
+client.moc: $(srcdir)/client.h
+	$(MOC) $(srcdir)/client.h -o client.moc
 
 #>+ 2
-mocs: defaultdictionary.moc
+mocs: client.moc
 
 #>+ 3
-client.moc: $(srcdir)/client.h
-	$(MOC) $(srcdir)/client.h -o client.moc
+defaultdictionary.moc: $(srcdir)/defaultdictionary.h
+	$(MOC) $(srcdir)/defaultdictionary.h -o defaultdictionary.moc
 
 #>+ 2
-mocs: client.moc
+mocs: defaultdictionary.moc
 
 #>+ 3
 backgroundengine.moc: $(srcdir)/backgroundengine.h
@@ -1016,7 +1019,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  defaultdictionary.moc client.moc backgroundengine.moc broker.moc backgroundchecker.moc
+	-rm -f  client.moc defaultdictionary.moc backgroundengine.moc broker.moc backgroundchecker.moc
 
 #>+ 2
 KDE_DIST=backgroundengine.h Makefile.in backgroundthread.h client.h kspellclient.desktop threadevents.h Makefile.am 
@@ -1029,8 +1032,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1063,7 +1066,7 @@
 
 
 #>+ 11
-libkspell2base_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settings.cpp $(srcdir)/broker.cpp $(srcdir)/client.cpp $(srcdir)/filter.cpp $(srcdir)/backgroundchecker.cpp $(srcdir)/backgroundthread.cpp $(srcdir)/backgroundengine.cpp $(srcdir)/defaultdictionary.cpp  client.moc defaultdictionary.moc backgroundengine.moc broker.moc backgroundchecker.moc
+libkspell2base_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settings.cpp $(srcdir)/broker.cpp $(srcdir)/client.cpp $(srcdir)/filter.cpp $(srcdir)/backgroundchecker.cpp $(srcdir)/backgroundthread.cpp $(srcdir)/backgroundengine.cpp $(srcdir)/defaultdictionary.cpp  defaultdictionary.moc client.moc backgroundengine.moc broker.moc backgroundchecker.moc
 	@echo 'creating libkspell2base_la.all_cpp.cpp ...'; \
 	rm -f libkspell2base_la.all_cpp.files libkspell2base_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkspell2base_la.all_cpp.final; \
@@ -1106,8 +1109,8 @@
 defaultdictionary.o: defaultdictionary.moc 
 backgroundchecker.o: backgroundchecker.moc 
 broker.lo: broker.moc 
-client.lo: client.moc 
 defaultdictionary.lo: defaultdictionary.moc 
+client.lo: client.moc 
 backgroundengine.lo: backgroundengine.moc 
 client.o: client.moc 
 backgroundchecker.lo: backgroundchecker.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -67,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
@@ -83,7 +84,8 @@
 #>+ 1
 test_highlighter_OBJECTS = test_highlighter.$(OBJEXT)
 test_highlighter_DEPENDENCIES = ../ui/libkspell2_noinst.la \
-	../libkspell2base.la $(am__DEPENDENCIES_1)
+	../libkspell2base.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) ../../kutils/libkutils.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
@@ -128,6 +130,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -242,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@
@@ -270,6 +273,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -279,6 +283,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -307,6 +312,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -357,6 +363,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -414,6 +421,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -432,21 +440,21 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -457,8 +465,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -479,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-checkPROGRAMS:
@@ -554,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -764,8 +772,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/ui/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/ui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,11 @@
 	"$(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 \
+	../../kutils/libkutils.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkspell2_la_OBJECTS = dialog.lo
 #>- libkspell2_la_OBJECTS = $(am_libkspell2_la_OBJECTS)
 #>+ 1
@@ -125,6 +129,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -239,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@
@@ -267,6 +272,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -276,6 +282,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -304,6 +311,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -354,6 +362,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -411,6 +420,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -436,19 +446,19 @@
 
 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 ../../kutils/libkutils.la  $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE)
 #>- 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -459,8 +469,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -481,9 +491,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -586,7 +596,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -817,8 +827,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -383,12 +389,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -399,8 +405,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -421,9 +427,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:
@@ -507,7 +513,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -724,8 +730,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/hspell/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/hspell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,7 +59,9 @@
 	"$(DESTDIR)$(servicedir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kspell_hspell_la_DEPENDENCIES = ../../ui/libkspell2.la
+am__DEPENDENCIES_1 =
+kspell_hspell_la_DEPENDENCIES = ../../ui/libkspell2.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kspell_hspell_la_OBJECTS = kspell_hspellclient.lo \
 	kspell_hspelldict.lo
 #>- kspell_hspell_la_OBJECTS = $(am_kspell_hspell_la_OBJECTS)
@@ -118,6 +120,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +263,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +273,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +302,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +353,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +411,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -420,7 +428,7 @@
 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)
-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz
+kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_KDECORE)
 service_DATA = kspell_hspell.desktop
 servicedir = $(kde_servicesdir)
 #>- all: all-am
@@ -429,12 +437,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -559,7 +567,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -769,8 +777,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/hspell/kspell_hspell.desktop
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/hspell/kspell_hspell.desktop
@@ -16,3 +16,4 @@
 Name[ne]=एच स्पेल
 Name[sv]=Hspell
 Name[te]=హెచ్ స్పెల్
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/ispell/kspell_ispell.desktop
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/ispell/kspell_ispell.desktop
@@ -20,3 +20,4 @@
 Name[ta]=psதேர்ந்தெடு
 Name[te]=ఐస్పెల్
 Name[tg]=psselect
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/ispell/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/ispell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,7 +59,9 @@
 	"$(DESTDIR)$(servicedir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kspell_ispell_la_DEPENDENCIES = ../../ui/libkspell2.la
+am__DEPENDENCIES_1 =
+kspell_ispell_la_DEPENDENCIES = ../../ui/libkspell2.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kspell_ispell_la_OBJECTS = kspell_ispellclient.lo \
 	kspell_ispelldict.lo correct.lo good.lo hash.lo lookup.lo \
 	makedent.lo tgood.lo ispell_checker.lo
@@ -120,6 +122,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -234,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@
@@ -262,6 +265,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -271,6 +275,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -299,6 +304,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -349,6 +355,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -406,6 +413,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -430,7 +438,7 @@
 	ispell_checker.cpp
 
 kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la 
+kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_KDECORE)
 service_DATA = kspell_ispell.desktop
 servicedir = $(kde_servicesdir)
 #>- all: all-am
@@ -439,12 +447,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -455,8 +463,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -477,9 +485,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -576,7 +584,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -786,8 +794,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/aspell/kspell_aspell.desktop
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/aspell/kspell_aspell.desktop
@@ -19,3 +19,4 @@
 Name[sv]=Aspell
 Name[ta]=psதேர்ந்தெடு
 Name[te]=ఏస్పెల్
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kspell2/plugins/aspell/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kspell2/plugins/aspell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,7 +59,9 @@
 	"$(DESTDIR)$(servicedir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kspell_aspell_la_DEPENDENCIES = ../../ui/libkspell2.la
+am__DEPENDENCIES_1 =
+kspell_aspell_la_DEPENDENCIES = ../../ui/libkspell2.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kspell_aspell_la_OBJECTS = kspell_aspellclient.lo \
 	kspell_aspelldict.lo
 #>- kspell_aspell_la_OBJECTS = $(am_kspell_aspell_la_OBJECTS)
@@ -118,6 +120,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +263,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +273,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +302,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +353,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +411,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -420,7 +428,7 @@
 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)
-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell
+kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_KDECORE)
 service_DATA = kspell_aspell.desktop
 servicedir = $(kde_servicesdir)
 #>- all: all-am
@@ -429,12 +437,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -559,7 +567,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -769,8 +777,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/libkscreensaver/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/libkscreensaver/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkscreensaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkscreensaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkscreensaver_la_OBJECTS = main.lo kscreensaver.lo
 #>- libkscreensaver_la_OBJECTS = $(am_libkscreensaver_la_OBJECTS)
 #>+ 4
@@ -117,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -231,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@
@@ -259,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -268,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -296,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -346,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -403,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -412,7 +419,7 @@
 xdg_menudir = @xdg_menudir@
 lib_LTLIBRARIES = libkscreensaver.la
 libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
-libkscreensaver_la_LIBADD = $(LIB_KIO)
+libkscreensaver_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
 @undefined_symbols_allowed_FALSE@libkscreensaver_la_LDFLAGS = $(all_libraries) -static
 @undefined_symbols_allowed_TRUE@libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
 include_HEADERS = kscreensaver.h kscreensaver_vroot.h
@@ -424,12 +431,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -440,8 +447,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -462,9 +469,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -554,7 +561,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -857,8 +864,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -105,7 +105,11 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kdeprint/libkdeprint.la \
 	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kwallet/client/libkwalletclient.la
+	$(top_builddir)/kwallet/client/libkwalletclient.la \
+	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkhtml_la_OBJECTS = khtmlview.lo khtml_part.lo khtml_run.lo \
 	khtml_factory.lo khtml_settings.lo khtml_events.lo \
 	khtml_ext.lo khtml_pagecache.lo khtml_iface.lo \
@@ -241,6 +245,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -355,7 +361,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@
@@ -383,6 +388,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -392,6 +398,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -420,6 +427,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -470,6 +478,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -527,6 +536,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -568,7 +578,7 @@
 	$(LIBTHAI) \
 	$(top_builddir)/kdeprint/libkdeprint.la  \
 	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kwallet/client/libkwalletclient.la
+	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
 
 libkhtmlpart_la_SOURCES = dummy.cpp
 libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
@@ -609,12 +619,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -625,8 +635,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -647,9 +657,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -926,7 +936,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1395,8 +1405,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/khtmlimage.desktop
+++ kdelibs-3.5.10.dfsg.1/khtml/khtmlimage.desktop
@@ -168,3 +168,4 @@
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 InitialPreference=4
 X-KDE-Library=khtmlimagepart
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/khtml/khtml.desktop
+++ kdelibs-3.5.10.dfsg.1/khtml/khtml.desktop
@@ -91,3 +91,4 @@
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-KDE-Library=libkhtmlpart
 InitialPreference=10
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/khtml/misc/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -73,12 +73,14 @@
 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)
 #>- libkhtmlmisc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -129,6 +131,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -243,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@
@@ -271,6 +274,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -280,6 +284,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -308,6 +313,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -358,6 +364,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -415,6 +422,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -426,14 +434,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)
@@ -445,12 +453,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -461,8 +469,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -483,9 +491,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:
@@ -510,6 +518,7 @@
 @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@
@@ -546,7 +555,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -730,6 +739,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
 
@@ -738,7 +754,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 
@@ -751,8 +767,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -785,11 +801,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; \
@@ -820,8 +836,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.10.dfsg.1.orig/khtml/pics/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/pics/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -372,12 +378,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -388,8 +394,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -410,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:
@@ -572,37 +578,37 @@
 	$(INSTALL_DATA) $(srcdir)/cr64-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions
 	$(INSTALL_DATA) $(srcdir)/cr16-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/bug.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions
 	$(INSTALL_DATA) $(srcdir)/cr128-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions/bug.png
-	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/cr32-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
+	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions
+	$(INSTALL_DATA) $(srcdir)/cr22-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions
 	$(INSTALL_DATA) $(srcdir)/cr48-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions/bug.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
-	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions
+	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions
+	$(INSTALL_DATA) $(srcdir)/cr32-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrunto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgstep.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgstep.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrunto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrun.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgnext.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
 
 uninstall-kde-icons:
 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/bug.png
+	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions/bug.png
-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
+	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions/bug.png
-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
+	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
+	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgstep.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrun.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
 
@@ -611,8 +617,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/kmultipart/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/kmultipart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -113,6 +113,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -227,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@
@@ -255,6 +256,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -264,6 +266,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -292,6 +295,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -342,6 +346,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -399,6 +404,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -412,7 +418,7 @@
 # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
 kde_module_LTLIBRARIES = libkmultipart.la
 libkmultipart_la_SOURCES = kmultipart.cpp
-libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la
+libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBZ)
 libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
@@ -427,12 +433,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -443,8 +449,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -465,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -556,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -770,8 +776,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/kmultipart/kmultipart.desktop
+++ kdelibs-3.5.10.dfsg.1/khtml/kmultipart/kmultipart.desktop
@@ -71,3 +71,4 @@
 Name[zh_TW]=multipart/mixed 的可嵌入元件
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=libkmultipart
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/khtml/dom/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/dom/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -139,6 +139,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -253,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@
@@ -281,6 +282,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -290,6 +292,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -318,6 +321,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -368,6 +372,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -425,6 +430,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -469,12 +475,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -485,8 +491,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -507,9 +513,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:
@@ -605,7 +611,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -803,8 +809,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/css/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/css/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -133,6 +133,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -247,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@
@@ -275,6 +276,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -284,6 +286,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -312,6 +315,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -362,6 +366,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -419,6 +424,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -458,12 +464,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -474,8 +480,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,9 +502,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 +583,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -781,8 +787,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/ecma/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/ecma/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -126,6 +126,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -240,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@
@@ -268,6 +269,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -277,6 +279,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -305,6 +308,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -355,6 +359,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -412,6 +417,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -446,12 +452,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -462,8 +468,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -484,9 +490,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:
@@ -555,7 +561,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -820,8 +826,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/xml/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/xml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -127,6 +127,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -241,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@
@@ -269,6 +270,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -278,6 +280,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -306,6 +309,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -356,6 +360,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -413,6 +418,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -448,12 +454,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -464,8 +470,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -486,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:
@@ -553,7 +559,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -765,8 +771,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/rendering/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/rendering/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -135,6 +135,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -249,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@
@@ -277,6 +278,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -286,6 +288,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -314,6 +317,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -364,6 +368,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -421,6 +426,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -460,12 +466,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -476,8 +482,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -498,9 +504,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:
@@ -580,7 +586,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -767,18 +773,18 @@
 .NOEXPORT:
 
 #>+ 3
-render_form.moc: $(srcdir)/render_form.h
-	$(MOC) $(srcdir)/render_form.h -o render_form.moc
+render_layer.moc: $(srcdir)/render_layer.h
+	$(MOC) $(srcdir)/render_layer.h -o render_layer.moc
 
 #>+ 2
-mocs: render_form.moc
+mocs: render_layer.moc
 
 #>+ 3
-render_layer.moc: $(srcdir)/render_layer.h
-	$(MOC) $(srcdir)/render_layer.h -o render_layer.moc
+render_form.moc: $(srcdir)/render_form.h
+	$(MOC) $(srcdir)/render_form.h -o render_form.moc
 
 #>+ 2
-mocs: render_layer.moc
+mocs: render_form.moc
 
 #>+ 3
 render_frames.moc: $(srcdir)/render_frames.h
@@ -796,7 +802,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  render_form.moc render_layer.moc render_frames.moc render_replaced.moc
+	-rm -f  render_layer.moc render_form.moc render_frames.moc render_replaced.moc
 
 #>+ 2
 KDE_DIST=render_inline.h render_block.h img-loading.png table_layout.txt Makefile.in counter_tree.h render_applet.cpp render_body.h render_image.h loading_icon.cpp Makefile.am 
@@ -809,8 +815,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -843,7 +849,7 @@
 
 
 #>+ 11
-libkhtmlrender_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bidi.cpp $(srcdir)/break_lines.cpp $(srcdir)/render_block.cpp $(srcdir)/render_inline.cpp $(srcdir)/render_style.cpp $(srcdir)/render_object.cpp $(srcdir)/render_container.cpp $(srcdir)/render_box.cpp $(srcdir)/render_flow.cpp $(srcdir)/render_text.cpp $(srcdir)/render_arena.cpp $(srcdir)/render_layer.cpp $(srcdir)/render_image.cpp $(srcdir)/render_table.cpp $(srcdir)/table_layout.cpp $(srcdir)/render_replaced.cpp $(srcdir)/render_form.cpp $(srcdir)/render_list.cpp $(srcdir)/render_canvas.cpp $(srcdir)/render_frames.cpp $(srcdir)/render_br.cpp $(srcdir)/render_body.cpp $(srcdir)/font.cpp $(srcdir)/render_line.cpp $(srcdir)/render_generated.cpp $(srcdir)/enumerate.cpp $(srcdir)/counter_tree.cpp  render_layer.moc render_form.moc render_frames.moc render_replaced.moc
+libkhtmlrender_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bidi.cpp $(srcdir)/break_lines.cpp $(srcdir)/render_block.cpp $(srcdir)/render_inline.cpp $(srcdir)/render_style.cpp $(srcdir)/render_object.cpp $(srcdir)/render_container.cpp $(srcdir)/render_box.cpp $(srcdir)/render_flow.cpp $(srcdir)/render_text.cpp $(srcdir)/render_arena.cpp $(srcdir)/render_layer.cpp $(srcdir)/render_image.cpp $(srcdir)/render_table.cpp $(srcdir)/table_layout.cpp $(srcdir)/render_replaced.cpp $(srcdir)/render_form.cpp $(srcdir)/render_list.cpp $(srcdir)/render_canvas.cpp $(srcdir)/render_frames.cpp $(srcdir)/render_br.cpp $(srcdir)/render_body.cpp $(srcdir)/font.cpp $(srcdir)/render_line.cpp $(srcdir)/render_generated.cpp $(srcdir)/enumerate.cpp $(srcdir)/counter_tree.cpp  render_form.moc render_layer.moc render_frames.moc render_replaced.moc
 	@echo 'creating libkhtmlrender_la.all_cpp.cpp ...'; \
 	rm -f libkhtmlrender_la.all_cpp.files libkhtmlrender_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkhtmlrender_la.all_cpp.final; \
@@ -885,7 +891,7 @@
 render_replaced.o: render_replaced.moc 
 nmcheck-am: nmcheck
 render_replaced.lo: render_replaced.moc 
-render_layer.o: render_layer.moc 
 render_form.lo: render_form.moc 
+render_layer.o: render_layer.moc 
 render_frames.lo: render_frames.moc 
 render_layer.lo: render_layer.moc 
--- kdelibs-3.5.10.dfsg.1.orig/khtml/html/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/html/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -127,6 +127,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -241,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@
@@ -269,6 +270,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -278,6 +280,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -306,6 +309,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -356,6 +360,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -413,6 +418,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -451,12 +457,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -467,8 +473,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -489,9 +495,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:
@@ -559,7 +565,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -774,8 +780,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/java/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/java/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,10 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kjavaappletviewer_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+kjavaappletviewer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la
 am_kjavaappletviewer_la_OBJECTS = kjavaapplet.lo kjavaappletcontext.lo \
 	kjavaappletserver.lo kjavaappletwidget.lo kjavaprocess.lo \
 	kjavadownloader.lo kjavaappletviewer.lo
@@ -162,6 +165,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -304,6 +308,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -313,6 +318,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -341,6 +347,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -391,6 +398,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -448,6 +456,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -483,7 +492,7 @@
         kjavadownloader.cpp kjavaappletviewer.cpp
 
 kjavaappletviewer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD = $(LIB_KPARTS)
+kjavaappletviewer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
 kde_services_DATA = kjavaappletviewer.desktop
 #>- all: all-recursive
 #>+ 1
@@ -491,12 +500,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -507,8 +516,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -529,9 +538,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
 kjava.policy: $(top_builddir)/config.status $(srcdir)/kjava.policy.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -726,7 +735,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -957,13 +966,6 @@
 .NOEXPORT:
 
 #>+ 3
-kjavaappletcontext.moc: $(srcdir)/kjavaappletcontext.h
-	$(MOC) $(srcdir)/kjavaappletcontext.h -o kjavaappletcontext.moc
-
-#>+ 2
-mocs: kjavaappletcontext.moc
-
-#>+ 3
 kjavaapplet.moc: $(srcdir)/kjavaapplet.h
 	$(MOC) $(srcdir)/kjavaapplet.h -o kjavaapplet.moc
 
@@ -971,11 +973,11 @@
 mocs: kjavaapplet.moc
 
 #>+ 3
-kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
-	$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
+kjavaappletcontext.moc: $(srcdir)/kjavaappletcontext.h
+	$(MOC) $(srcdir)/kjavaappletcontext.h -o kjavaappletcontext.moc
 
 #>+ 2
-mocs: kjavaappletserver.moc
+mocs: kjavaappletcontext.moc
 
 #>+ 3
 kjavadownloader.moc: $(srcdir)/kjavadownloader.h
@@ -985,6 +987,13 @@
 mocs: kjavadownloader.moc
 
 #>+ 3
+kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
+	$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
+
+#>+ 2
+mocs: kjavaappletserver.moc
+
+#>+ 3
 kjavaprocess.moc: $(srcdir)/kjavaprocess.h
 	$(MOC) $(srcdir)/kjavaprocess.h -o kjavaprocess.moc
 
@@ -1007,7 +1016,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kjavaappletcontext.moc kjavaapplet.moc kjavaappletserver.moc kjavadownloader.moc kjavaprocess.moc kjavaappletwidget.moc kjavaappletviewer.moc
+	-rm -f  kjavaapplet.moc kjavaappletcontext.moc kjavadownloader.moc kjavaappletserver.moc kjavaprocess.moc kjavaappletwidget.moc kjavaappletviewer.moc
 
 #>+ 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 
@@ -1028,8 +1037,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1062,7 +1071,7 @@
 
 
 #>+ 11
-kjavaappletviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp $(srcdir)/kjavaappletviewer.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavadownloader.moc kjavaappletserver.moc kjavaappletwidget.moc kjavaprocess.moc kjavaappletviewer.moc
+kjavaappletviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp $(srcdir)/kjavaappletviewer.cpp  kjavaappletcontext.moc kjavaapplet.moc kjavaappletserver.moc kjavadownloader.moc kjavaappletwidget.moc kjavaprocess.moc kjavaappletviewer.moc
 	@echo 'creating kjavaappletviewer_la.all_cpp.cpp ...'; \
 	rm -f kjavaappletviewer_la.all_cpp.files kjavaappletviewer_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kjavaappletviewer_la.all_cpp.final; \
@@ -1074,7 +1083,7 @@
 	rm -f kjavaappletviewer_la.all_cpp.final kjavaappletviewer_la.all_cpp.files
 
 #>+ 11
-libkjava_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavadownloader.moc kjavaappletserver.moc kjavaappletwidget.moc kjavaprocess.moc
+libkjava_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp  kjavaappletcontext.moc kjavaapplet.moc kjavaappletserver.moc kjavadownloader.moc kjavaappletwidget.moc kjavaprocess.moc
 	@echo 'creating libkjava_la.all_cpp.cpp ...'; \
 	rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/java/kjavaappletviewer.desktop
+++ kdelibs-3.5.10.dfsg.1/khtml/java/kjavaappletviewer.desktop
@@ -80,3 +80,4 @@
 Type=Service
 InitialPreference=2
 X-KDE-BrowserView-PluginsInfo=kjava/pluginsinfo
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/khtml/java/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/java/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -93,6 +93,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -207,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@
@@ -235,6 +236,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -244,6 +246,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -272,6 +275,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -322,6 +326,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -379,6 +384,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -398,12 +404,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -414,8 +420,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -436,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
 
 clean-checkPROGRAMS:
@@ -491,7 +497,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -683,8 +689,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/khtml/java/dummy/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/khtml/java/dummy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -109,6 +109,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -223,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@
@@ -251,6 +252,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -260,6 +262,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -288,6 +291,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -338,6 +342,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -395,6 +400,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -411,12 +417,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -427,8 +433,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -449,9 +455,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -523,7 +529,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -724,8 +730,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdoctools/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdoctools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -68,7 +68,9 @@
 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__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
@@ -84,7 +86,9 @@
 	$(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__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
@@ -99,8 +103,7 @@
 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_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+libkbzipfilter_dummy_la_LIBADD =
 am_libkbzipfilter_dummy_la_OBJECTS = kbzip2filter.lo
 #>- libkbzipfilter_dummy_la_OBJECTS =  \
 #>- 	$(am_libkbzipfilter_dummy_la_OBJECTS)
@@ -113,7 +116,9 @@
 #>+ 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)
@@ -163,6 +168,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -277,7 +284,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,6 +311,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -314,6 +321,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -342,6 +350,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -392,6 +401,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -449,6 +459,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -460,20 +471,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) $(LIB_QT) $(LIB_KDECORE)
 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) $(LIB_QT) $(LIB_KDECORE)
 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
@@ -487,12 +497,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -503,8 +513,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -525,9 +535,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
 checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -722,7 +732,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1051,8 +1061,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdoctools/help.protocol
+++ kdelibs-3.5.10.dfsg.1/kdoctools/help.protocol
@@ -7,3 +7,4 @@
 defaultMimetype=text/html
 Icon=help
 Class=:local
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kdoctools/ghelp.protocol
+++ kdelibs-3.5.10.dfsg.1/kdoctools/ghelp.protocol
@@ -7,3 +7,4 @@
 defaultMimetype=text/html
 Icon=help
 Class=:local
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kresources/kresources_manager.desktop
+++ kdelibs-3.5.10.dfsg.1/kresources/kresources_manager.desktop
@@ -73,3 +73,4 @@
 
 [PropertyDef::X-KDE-ResourceFamily]
 Type=QString
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kresources/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kresources/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -64,7 +64,10 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kcm_kresources_la_DEPENDENCIES = libkresources.la
+am__DEPENDENCIES_1 =
+kcm_kresources_la_DEPENDENCIES = libkresources.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kcm_kresources_la_OBJECTS = kcmkresources.lo
 #>- kcm_kresources_la_OBJECTS = $(am_kcm_kresources_la_OBJECTS)
 #>+ 1
@@ -76,9 +79,9 @@
 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)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/dcop/libDCOP.la $(am__DEPENDENCIES_1)
 am_libkresources_la_OBJECTS = resource.lo factory.lo managerimpl.lo \
 	configwidget.lo configdialog.lo selectdialog.lo configpage.lo
 #>- libkresources_la_OBJECTS = $(am_libkresources_la_OBJECTS)
@@ -154,6 +157,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -268,7 +273,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,6 +300,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -305,6 +310,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -333,6 +339,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -383,6 +390,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -440,6 +448,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -471,7 +480,7 @@
   configpage.cpp manageriface_skel.cpp manageriface_stub.cpp
 
 libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 kresincludedir = $(includedir)/kresources
 kresinclude_HEADERS = resource.h \
   configwidget.h \
@@ -486,7 +495,7 @@
 kde_module_LTLIBRARIES = kcm_kresources.la
 kcm_kresources_la_SOURCES = kcmkresources.cpp
 kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kresources_la_LIBADD = libkresources.la
+kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 testresources_LDADD = libkresources.la
 testresources_SOURCES = testresources.cpp
@@ -499,12 +508,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -515,8 +524,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -537,9 +546,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -709,7 +718,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1068,8 +1077,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kresources/kresources_plugin.desktop
+++ kdelibs-3.5.10.dfsg.1/kresources/kresources_plugin.desktop
@@ -77,3 +77,4 @@
 
 [PropertyDef::X-KDE-ResourceType]
 Type=QString
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kresources/kresources.desktop
+++ kdelibs-3.5.10.dfsg.1/kresources/kresources.desktop
@@ -208,3 +208,4 @@
 Categories=Qt;KDE;X-KDE-settings-components;
 OnlyShowIn=KDE;
 
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/dcop/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -88,7 +88,8 @@
 kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-#>- dcopserver_la_DEPENDENCIES = libDCOP.la
+am__DEPENDENCIES_1 =
+#>- dcopserver_la_DEPENDENCIES = libDCOP.la $(am__DEPENDENCIES_1)
 #>+ 1
 dcopserver_la_DEPENDENCIES = libkdeinit_dcopserver.la
 #>- am_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo
@@ -104,7 +105,6 @@
 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 \
 	dcopclient.lo
@@ -248,6 +248,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -362,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@
@@ -390,6 +391,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -399,6 +401,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -427,6 +430,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -477,6 +481,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -534,6 +539,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -560,7 +566,7 @@
 kdeinit_LTLIBRARIES = dcopserver.la
 dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
 dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
-#>- dcopserver_la_LIBADD = libDCOP.la
+#>- dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
 #>+ 1
 dcopserver_la_LIBADD = libkdeinit_dcopserver.la
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
@@ -583,12 +589,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -599,8 +605,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -621,9 +627,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
 
 dcop-path.h: stamp-h2
@@ -635,7 +641,7 @@
 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 $@
@@ -906,7 +912,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1229,13 +1235,13 @@
 .NOEXPORT:
 
 #>+ 2
-libkdeinit_dcopserver_la_LIBADD = libDCOP.la
+libkdeinit_dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
 
 #>+ 2
 libkdeinit_dcopserver_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
 
 #>+ 2
-libkdeinit_dcopserver_la_DEPENDENCIES = libDCOP.la
+libkdeinit_dcopserver_la_DEPENDENCIES = libDCOP.la $(am__DEPENDENCIES_1)
 
 #>+ 2
 am_libkdeinit_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo
@@ -1302,8 +1308,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/client/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/client/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -171,6 +171,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -285,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@
@@ -313,6 +314,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -322,6 +324,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -350,6 +353,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -400,6 +404,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -457,6 +462,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -488,12 +494,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -504,8 +510,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -526,9 +532,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -647,7 +653,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -839,8 +845,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/dcopidl2cpp/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/dcopidl2cpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -113,6 +113,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -227,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@
@@ -255,6 +256,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -264,6 +266,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -292,6 +295,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -342,6 +346,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -399,6 +404,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -418,12 +424,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -434,8 +440,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -456,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -535,7 +541,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -725,7 +731,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=type.h dcopidl_test.h Makefile.in Makefile.am 
+KDE_DIST=dcopidl_test.h type.h Makefile.in Makefile.am 
 
 #>+ 2
 docs-am:
@@ -735,8 +741,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/KDE-ICE/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/KDE-ICE/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -95,6 +95,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -209,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@
@@ -237,6 +238,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -246,6 +248,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -274,6 +277,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -324,6 +328,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -381,6 +386,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -430,12 +436,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -446,8 +452,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -468,9 +474,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:
@@ -543,7 +549,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -733,8 +739,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/dcopidlng/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/dcopidlng/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -77,6 +77,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -191,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@
@@ -219,6 +220,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -228,6 +230,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -256,6 +259,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -306,6 +310,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -363,6 +368,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -379,12 +385,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -395,8 +401,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -417,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
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -640,8 +646,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -119,6 +119,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -233,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@
@@ -261,6 +262,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -270,6 +272,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -298,6 +301,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -348,6 +352,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -405,6 +410,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -434,12 +440,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -450,8 +456,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -472,9 +478,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:
@@ -531,7 +537,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -769,8 +775,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/dcop/dcopidl/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/dcop/dcopidl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -111,6 +111,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -225,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@
@@ -253,6 +254,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -262,6 +264,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -290,6 +293,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -340,6 +344,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -397,6 +402,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -419,12 +425,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -435,8 +441,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -457,9 +463,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -556,7 +562,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -759,8 +765,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/libkmid/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/libkmid/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,7 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkmid_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../kdecore/libkdecore.la
+	../kdecore/libkdecore.la $(am__DEPENDENCIES_1)
 am_libkmid_la_OBJECTS = midiout.lo player.lo track.lo midimapper.lo \
 	midfile.lo dattypes.lo midistat.lo deviceman.lo synthout.lo \
 	fmout.lo gusout.lo alsaout.lo voiceman.lo mt32togm.lo \
@@ -125,6 +125,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -267,6 +268,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -276,6 +278,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -304,6 +307,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -354,6 +358,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -411,6 +416,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -436,7 +442,7 @@
 	libkmid.cc
 
 libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la
+libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la $(LIB_QT)
 DOXYGEN_REFERENCES = kdecore
 #>- all: all-am
 #>+ 1
@@ -444,12 +450,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -460,8 +466,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -482,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
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -588,7 +594,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -877,8 +883,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/libkmid/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/libkmid/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -114,6 +114,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -228,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@
@@ -256,6 +257,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -265,6 +267,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -293,6 +296,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -343,6 +347,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -400,6 +405,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -420,12 +426,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -436,8 +442,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -458,9 +464,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:
@@ -542,7 +548,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -732,8 +738,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/libltdl/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/libltdl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -87,6 +87,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -201,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@
@@ -229,6 +230,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -238,6 +240,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -266,6 +269,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -316,6 +320,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -373,6 +378,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -391,12 +397,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -407,8 +413,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -429,9 +435,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:
@@ -471,7 +477,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -665,8 +671,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kmdi/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kmdi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,7 +61,9 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkmdi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/kutils/libkutils.la
+	$(top_builddir)/kutils/libkutils.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkmdi_la_OBJECTS = kmdichildarea.lo kmdichildfrm.lo \
 	kmdichildfrmcaption.lo kmdichildview.lo kmdimainfrm.lo \
 	kmditaskbar.lo kmdidockcontainer.lo kmditoolviewaccessor.lo \
@@ -142,6 +144,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -256,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@
@@ -284,6 +287,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -293,6 +297,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -321,6 +326,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -371,6 +377,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -428,6 +435,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -439,7 +447,7 @@
 INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
 lib_LTLIBRARIES = libkmdi.la
 libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
+libkmdi_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
 libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
                      kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
 		     kmditoolviewaccessor.cpp kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp \
@@ -456,12 +464,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -472,8 +480,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -494,9 +502,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -665,7 +673,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1069,8 +1077,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kmdi/test/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kmdi/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -106,6 +106,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -220,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@
@@ -248,6 +249,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -257,6 +259,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -285,6 +288,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -335,6 +339,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -392,6 +397,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -412,12 +418,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -428,8 +434,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -450,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-checkPROGRAMS:
@@ -507,7 +513,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -717,8 +723,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kmdi/kmdi/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kmdi/kmdi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -61,7 +61,8 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkmdi2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/kutils/libkutils.la
+	$(top_builddir)/kutils/libkutils.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkmdi2_la_OBJECTS = mainwindow.lo dockcontainer.lo \
 	toolviewaccessor.lo guiclient.lo tabwidget.lo
 #>- libkmdi2_la_OBJECTS = $(am_libkmdi2_la_OBJECTS)
@@ -120,6 +121,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -234,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@
@@ -262,6 +264,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -271,6 +274,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -299,6 +303,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -349,6 +354,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -406,6 +412,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -416,7 +423,7 @@
 INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
 lib_LTLIBRARIES = libkmdi2.la
 libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi2_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
+libkmdi2_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
 libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
 kmdiincludedir = $(includedir)/kmdi
 kmdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
@@ -427,12 +434,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -443,8 +450,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -465,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -560,7 +567,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -846,18 +853,18 @@
 mocs: toolviewaccessor.moc
 
 #>+ 3
-mainwindow.moc: $(srcdir)/mainwindow.h
-	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+tabwidget.moc: $(srcdir)/tabwidget.h
+	$(MOC) $(srcdir)/tabwidget.h -o tabwidget.moc
 
 #>+ 2
-mocs: mainwindow.moc
+mocs: tabwidget.moc
 
 #>+ 3
-tabwidget.moc: $(srcdir)/tabwidget.h
-	$(MOC) $(srcdir)/tabwidget.h -o tabwidget.moc
+mainwindow.moc: $(srcdir)/mainwindow.h
+	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
 
 #>+ 2
-mocs: tabwidget.moc
+mocs: mainwindow.moc
 
 #>+ 3
 guiclient.moc: $(srcdir)/guiclient.h
@@ -875,7 +882,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  toolviewaccessor.moc mainwindow.moc tabwidget.moc guiclient.moc dockcontainer.moc
+	-rm -f  toolviewaccessor.moc tabwidget.moc mainwindow.moc guiclient.moc dockcontainer.moc
 
 #>+ 2
 KDE_DIST=Makefile.in dockcontainer.h toolviewaccessor_p.h guiclient.h Makefile.am 
@@ -888,8 +895,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -922,7 +929,7 @@
 
 
 #>+ 11
-libkmdi2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwindow.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/toolviewaccessor.cpp $(srcdir)/guiclient.cpp $(srcdir)/tabwidget.cpp  toolviewaccessor.moc tabwidget.moc mainwindow.moc dockcontainer.moc guiclient.moc
+libkmdi2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwindow.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/toolviewaccessor.cpp $(srcdir)/guiclient.cpp $(srcdir)/tabwidget.cpp  toolviewaccessor.moc mainwindow.moc tabwidget.moc dockcontainer.moc guiclient.moc
 	@echo 'creating libkmdi2_la.all_cpp.cpp ...'; \
 	rm -f libkmdi2_la.all_cpp.files libkmdi2_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkmdi2_la.all_cpp.final; \
@@ -959,14 +966,14 @@
 
 #>+ 13
 nmcheck: 
-tabwidget.lo: tabwidget.moc 
 mainwindow.lo: mainwindow.moc 
+tabwidget.lo: tabwidget.moc 
 nmcheck-am: nmcheck
 guiclient.lo: guiclient.moc 
 guiclient.o: guiclient.moc 
 dockcontainer.lo: dockcontainer.moc 
 toolviewaccessor.o: toolviewaccessor.moc 
-mainwindow.o: mainwindow.moc 
 tabwidget.o: tabwidget.moc 
+mainwindow.o: mainwindow.moc 
 toolviewaccessor.lo: toolviewaccessor.moc 
 dockcontainer.o: dockcontainer.moc 
--- kdelibs-3.5.10.dfsg.1.orig/arts/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/arts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -83,6 +83,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -197,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@
@@ -225,6 +226,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -234,6 +236,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -262,6 +265,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -312,6 +316,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -369,6 +374,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -384,12 +390,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -400,8 +406,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -422,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:
@@ -508,7 +514,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -817,8 +823,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/arts/kde/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/arts/kde/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -63,7 +63,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libartskde_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libartskde_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libartskde_la_OBJECTS = artskde.lo kioinputstream_impl.lo \
 	kplayobject.lo kplayobjectfactory.lo kartsfloatwatch.lo \
 	kartsdispatcher.lo kaudiorecordstream.lo kaudioplaystream.lo \
@@ -146,6 +148,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -260,7 +264,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,6 +291,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -297,6 +301,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -325,6 +330,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -375,6 +381,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -432,6 +439,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -450,7 +458,7 @@
                         kvideowidget.cpp kplayobjectcreator.cc \
                         kaudiomanagerplay.cpp
 
-libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
+libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_KDECORE) -lkmedia2_idl -lartsflow $(LIB_KDEUI) $(LIB_X11)
 libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 #>- libartskde_la_METASOURCES = AUTO
 libartskde_la_COMPILE_FIRST = artskde.h
@@ -475,12 +483,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -491,8 +499,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -513,9 +521,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -657,7 +665,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -961,7 +969,7 @@
 	-rm -f  kioinputstream_impl.moc kaudiorecordstream.moc kartsserver.moc kartsfloatwatch.moc kconverttest.moc kaudioconverter.moc kvideowidget.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
 
 #>+ 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 
+KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl Makefile.in kaudioconverter.h kdatarequest_impl.h Makefile.am 
 
 #>+ 2
 docs-am:
@@ -971,8 +979,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/arts/kde/mcop-dcop/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/arts/kde/mcop-dcop/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -132,6 +132,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -246,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@
@@ -274,6 +275,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -283,6 +285,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -311,6 +314,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -361,6 +365,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -418,6 +423,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -450,12 +456,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -466,8 +472,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -488,9 +494,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -635,7 +641,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -887,8 +893,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/arts/kde/mcop-dcop/kmcop.desktop
+++ kdelibs-3.5.10.dfsg.1/arts/kde/mcop-dcop/kmcop.desktop
@@ -88,3 +88,4 @@
 ServiceTypes=KMCOP
 X-DCOP-ServiceType=Unique
 X-KDE-StartupNotify=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/arts/knotify/knotify.desktop
+++ kdelibs-3.5.10.dfsg.1/arts/knotify/knotify.desktop
@@ -117,3 +117,4 @@
 ServiceTypes=KNotify
 X-DCOP-ServiceType=Unique
 X-KDE-StartupNotify=false
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/arts/knotify/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/arts/knotify/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -64,7 +64,10 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @include_ARTS_TRUE@knotify_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@include_ARTS_TRUE@	$(top_builddir)/arts/kde/libartskde.la
+@include_ARTS_TRUE@	$(top_builddir)/arts/kde/libartskde.la \
+@include_ARTS_TRUE@	$(am__DEPENDENCIES_1) \
+@include_ARTS_TRUE@	$(top_builddir)/dcop/libDCOP.la \
+@include_ARTS_TRUE@	$(am__DEPENDENCIES_1)
 am_knotify_la_OBJECTS = knotify.lo
 #>- knotify_la_OBJECTS = $(am_knotify_la_OBJECTS)
 #>+ 4
@@ -134,6 +137,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -248,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@
@@ -276,6 +280,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -285,6 +290,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -313,6 +319,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -363,6 +370,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -420,6 +428,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -434,7 +443,7 @@
 #>- knotify_la_SOURCES = knotify.cpp knotify.skel
 #>+ 1
 knotify_la_SOURCES=knotify.cpp  knotify_skel.cpp
-@include_ARTS_TRUE@knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la
+@include_ARTS_TRUE@knotify_la_LIBADD = -lsoundserver_idl $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) -lartsflow_idl -lmcop
 knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #>- knotify_la_METASOURCES = AUTO
 knotifytest_SOURCES = knotifytest.cpp
@@ -449,12 +458,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -465,8 +474,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -487,9 +496,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -589,7 +598,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -815,8 +824,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/arts/message/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/arts/message/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -104,6 +104,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -218,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@
@@ -246,6 +247,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -255,6 +257,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -283,6 +286,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -333,6 +337,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -390,6 +395,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -407,12 +413,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -423,8 +429,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -445,9 +451,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -521,7 +527,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -713,8 +719,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kdefx/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kdefx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -81,7 +81,8 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkdefx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libkdefx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkdefx_la_OBJECTS = kpixmap.lo kpixmapsplitter.lo \
 	kpixmapeffect.lo kimageeffect.lo kdrawutil.lo kstyle.lo \
 	kcpuinfo.lo
@@ -142,6 +143,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -256,7 +259,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,6 +286,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -293,6 +296,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -321,6 +325,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -371,6 +376,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -428,6 +434,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -438,7 +445,7 @@
 INCLUDES = $(all_includes)
 lib_LTLIBRARIES = libkdefx.la
 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_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
 libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
 libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
 	$(top_srcdir)/kdecore/standard_weak.nmcheck
@@ -459,12 +466,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -475,8 +482,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -497,9 +504,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -594,7 +601,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -900,8 +907,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/licenses/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/licenses/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -72,6 +72,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -186,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@
@@ -214,6 +215,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -223,6 +225,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -251,6 +254,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -301,6 +305,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -358,6 +363,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -372,12 +378,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -388,8 +394,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -410,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:
@@ -588,8 +594,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/kab2kabc.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/kab2kabc.desktop
@@ -104,3 +104,4 @@
 NoDisplay=true
 X-KDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
 OnlyShowIn=KDE;
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/addressee.h
+++ kdelibs-3.5.10.dfsg.1/kabc/addressee.h
@@ -0,0 +1,837 @@
+/*** 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 department.
+     */
+    void setDepartment( const QString &department );
+    /**
+      Return department.
+     */
+    QString department() const;
+    /**
+      Return translated label for department field.
+     */
+    static QString departmentLabel();
+
+    /**
+      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.10.dfsg.1.orig/kabc/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -68,7 +68,9 @@
 am__DEPENDENCIES_1 =
 libkabc_la_DEPENDENCIES = vcard/libvcard.la vcardparser/libvcards.la \
 	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/kresources/libkresources.la
+	$(top_builddir)/kresources/libkresources.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkabc_la_OBJECTS = address.lo addressbook.lo addressee.lo \
 	addresseedialog.lo agent.lo distributionlist.lo \
 	distributionlistdialog.lo distributionlisteditor.lo \
@@ -181,6 +183,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -295,7 +299,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@
@@ -323,6 +326,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -332,6 +336,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -360,6 +365,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -410,6 +416,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -467,6 +474,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -486,7 +494,7 @@
 lib_LTLIBRARIES = libkabc.la
 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
+                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
 
 libkabc_la_COMPILE_FIRST = addressee.h
 #>- libkabc_la_SOURCES = \
@@ -541,12 +549,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -557,8 +565,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -579,9 +587,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -861,7 +869,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1086,12 +1094,8 @@
 	uninstall-local uninstall-managerDATA uninstall-mapDATA
 
 
-#>- field.cpp: addressee.h addressee.cpp
-#>+ 1
-field.cpp: addressee.h  addressee.h addressee.cpp
-#>- addressee.cpp: addressee.h
-#>+ 1
-addressee.cpp: addressee.h  addressee.h
+field.cpp: addressee.h addressee.cpp
+addressee.cpp: addressee.h
 addressee.cpp addressee.h field.cpp: \
 				$(srcdir)/scripts/makeaddressee \
 				$(srcdir)/scripts/addressee.src.cpp \
@@ -1301,8 +1305,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1335,7 +1339,7 @@
 
 
 #>+ 11
-libkabc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/address.cpp $(srcdir)/addressbook.cpp addressee.cpp $(srcdir)/addresseedialog.cpp $(srcdir)/agent.cpp $(srcdir)/distributionlist.cpp $(srcdir)/distributionlistdialog.cpp $(srcdir)/distributionlisteditor.cpp $(srcdir)/errorhandler.cpp field.cpp $(srcdir)/formatfactory.cpp $(srcdir)/geo.cpp $(srcdir)/key.cpp $(srcdir)/phonenumber.cpp $(srcdir)/picture.cpp $(srcdir)/plugin.cpp $(srcdir)/resource.cpp $(srcdir)/resourceselectdialog.cpp $(srcdir)/secrecy.cpp $(srcdir)/sound.cpp $(srcdir)/stdaddressbook.cpp $(srcdir)/timezone.cpp $(srcdir)/vcard21parser.cpp $(srcdir)/vcardconverter.cpp $(srcdir)/vcardformat.cpp $(srcdir)/vcardformatimpl.cpp $(srcdir)/vcardformatplugin.cpp $(srcdir)/ldifconverter.cpp $(srcdir)/addresslineedit.cpp $(srcdir)/ldapclient.cpp $(srcdir)/addresseelist.cpp $(srcdir)/vcardtool.cpp $(srcdir)/addresseehelper.cpp $(srcdir)/lock.cpp $(srcdir)/locknull.cpp $(srcdir)/ldif.cpp $(srcdir)/ldapurl.cpp $(srcdir)/ldapconfigwidget.cpp $(srcdir)/sortmode.cpp addresseehelper_skel.cpp  resourceselectdialog.moc lock.moc addressbook.moc ldapconfigwidget.moc distributionlisteditor.moc addresslineedit.moc addresseedialog.moc resource.moc distributionlistdialog.moc ldapclient.moc distributionlist.moc
+libkabc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/address.cpp $(srcdir)/addressbook.cpp $(srcdir)/addressee.cpp $(srcdir)/addresseedialog.cpp $(srcdir)/agent.cpp $(srcdir)/distributionlist.cpp $(srcdir)/distributionlistdialog.cpp $(srcdir)/distributionlisteditor.cpp $(srcdir)/errorhandler.cpp $(srcdir)/field.cpp $(srcdir)/formatfactory.cpp $(srcdir)/geo.cpp $(srcdir)/key.cpp $(srcdir)/phonenumber.cpp $(srcdir)/picture.cpp $(srcdir)/plugin.cpp $(srcdir)/resource.cpp $(srcdir)/resourceselectdialog.cpp $(srcdir)/secrecy.cpp $(srcdir)/sound.cpp $(srcdir)/stdaddressbook.cpp $(srcdir)/timezone.cpp $(srcdir)/vcard21parser.cpp $(srcdir)/vcardconverter.cpp $(srcdir)/vcardformat.cpp $(srcdir)/vcardformatimpl.cpp $(srcdir)/vcardformatplugin.cpp $(srcdir)/ldifconverter.cpp $(srcdir)/addresslineedit.cpp $(srcdir)/ldapclient.cpp $(srcdir)/addresseelist.cpp $(srcdir)/vcardtool.cpp $(srcdir)/addresseehelper.cpp $(srcdir)/lock.cpp $(srcdir)/locknull.cpp $(srcdir)/ldif.cpp $(srcdir)/ldapurl.cpp $(srcdir)/ldapconfigwidget.cpp $(srcdir)/sortmode.cpp addresseehelper_skel.cpp  resourceselectdialog.moc lock.moc addressbook.moc ldapconfigwidget.moc distributionlisteditor.moc addresslineedit.moc addresseedialog.moc resource.moc distributionlistdialog.moc ldapclient.moc distributionlist.moc
 	@echo 'creating libkabc_la.all_cpp.cpp ...'; \
 	rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
@@ -1370,7 +1374,7 @@
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 63
+#>+ 65
 : addressee.h 
 distributionlistdialog.lo: distributionlistdialog.moc 
 $(srcdir)/addresseehelper.cpp: addressee.h 
@@ -1380,6 +1384,7 @@
 $(srcdir)/formatfactory.cpp: addressee.h 
 distributionlistdialog.o: distributionlistdialog.moc 
 $(srcdir)/sound.cpp: addressee.h 
+$(srcdir)/field.cpp: addressee.h 
 distributionlist.o: distributionlist.moc 
 nmcheck-am: nmcheck
 $(srcdir)/resourceselectdialog.cpp: addressee.h 
@@ -1409,6 +1414,7 @@
 $(srcdir)/vcardformat.cpp: addressee.h 
 $(srcdir)/addresseedialog.cpp: addressee.h 
 $(srcdir)/picture.cpp: addressee.h 
+$(srcdir)/addressee.cpp: addressee.h 
 addresseedialog.lo: addresseedialog.moc 
 distributionlist.lo: distributionlist.moc 
 addresslineedit.o: addresslineedit.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kabc/field.cpp
+++ kdelibs-3.5.10.dfsg.1/kabc/field.cpp
@@ -0,0 +1,742 @@
+/*** 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,
+      Department,
+      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::Department:
+      return Addressee::departmentLabel();
+    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::Department:
+      return a.department();
+    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::Department:
+      a.setDepartment( 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::Department:
+      return a.department();
+    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::Department, 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.10.dfsg.1.orig/kabc/addressee.cpp
+++ kdelibs-3.5.10.dfsg.1/kabc/addressee.cpp
@@ -0,0 +1,1939 @@
+/*** 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 department;
+  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->department != a.mData->department &&
+     !( mData->department.isEmpty() && a.mData->department.isEmpty() ) ) {
+    kdDebug(5700) << "department 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::setDepartment( const QString &department )
+{
+  if ( department == mData->department ) return;
+  detach();
+  mData->empty = false;
+  mData->department = department;
+}
+
+QString Addressee::department() const
+{
+  return mData->department;
+}
+
+QString Addressee::departmentLabel()
+{
+  return i18n("Department");
+}
+
+
+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 ) {
+      QString name = realName();
+      name.replace( "\"", "\\\"" );
+      text = "\"" + name + "\" <" + 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) << "  Department: '" << department() << "'" << 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->department;
+  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->department;
+  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.10.dfsg.1.orig/kabc/kabc_manager.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/kabc_manager.desktop
@@ -75,3 +75,4 @@
 ServiceTypes=KResources/Manager
 
 X-KDE-ResourceFamily=contact
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/vcardparser/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/vcardparser/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -151,6 +151,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -265,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@
@@ -293,6 +294,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -302,6 +304,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -330,6 +333,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -380,6 +384,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -437,6 +442,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -465,12 +471,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -481,8 +487,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -503,9 +509,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:
@@ -598,7 +604,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -803,8 +809,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/scripts/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,6 +62,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -176,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@
@@ -204,6 +205,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -213,6 +215,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -241,6 +244,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -291,6 +295,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -348,6 +353,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -366,12 +372,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -382,8 +388,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -404,9 +410,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:
@@ -561,8 +567,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/formats/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/formats/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -60,7 +60,9 @@
 am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kabcformat_binary_la_DEPENDENCIES = $(top_builddir)/kabc/libkabc.la
+am__DEPENDENCIES_1 =
+kabcformat_binary_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kabcformat_binary_la_OBJECTS = binaryformat.lo
 #>- kabcformat_binary_la_OBJECTS = $(am_kabcformat_binary_la_OBJECTS)
 #>+ 1
@@ -115,6 +117,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,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@
@@ -257,6 +260,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -266,6 +270,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -294,6 +299,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -344,6 +350,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -401,6 +408,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -414,7 +422,7 @@
 kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined
 
-kabcformat_binary_la_LIBADD = $(top_builddir)/kabc/libkabc.la
+kabcformat_binary_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(LIB_KDECORE)
 kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 # these are the headers for your project
@@ -431,12 +439,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -447,8 +455,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -469,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -560,7 +568,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -762,8 +770,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/formats/binary.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/formats/binary.desktop
@@ -87,3 +87,4 @@
 [Plugin]
 Type=binary
 X-KDE-Library=kabcformat_binary
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -273,6 +273,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -387,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@
@@ -415,6 +416,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -424,6 +426,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -452,6 +455,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -502,6 +506,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -559,6 +564,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -609,12 +615,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -625,8 +631,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -647,9 +653,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:
@@ -750,7 +756,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -960,8 +966,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/vcard/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/vcard/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -59,7 +59,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libvcard_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libvcard_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libvcard_la_OBJECTS = vCard-all.lo
 #>- libvcard_la_OBJECTS = $(am_libvcard_la_OBJECTS)
 #>+ 1
@@ -137,6 +137,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -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@
@@ -279,6 +280,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -288,6 +290,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -316,6 +319,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -366,6 +370,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -423,6 +428,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -440,7 +446,7 @@
 lib_LTLIBRARIES = libvcard.la
 libvcard_la_SOURCES = vCard-all.cpp
 libvcard_la_LDFLAGS = $(all_libraries)
-libvcard_la_LIBADD = $(LIB_KDECORE)
+libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 testwrite_LDADD = libvcard.la 
 testwrite_SOURCES = testwrite.cpp
@@ -453,12 +459,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -469,8 +475,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -491,9 +497,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -580,7 +586,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -766,7 +772,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=VCardEntity.cpp TextListValue.cpp ClassValue.cpp TextValue.cpp DateValue.cpp TelParam.cpp ImgValue.cpp Entity.cpp Param.cpp ImageParam.cpp AdrParam.cpp TextBinValue.cpp VCard.cpp SoundValue.cpp UTCValue.cpp RToken.cpp NValue.cpp TextParam.cpp LangValue.cpp AgentValue.cpp URIValue.cpp Enum.cpp PhoneNumberValue.cpp GeoValue.cpp SourceParam.cpp Makefile.in Value.cpp ContentLine.cpp OrgValue.cpp EmailParam.cpp TextBinParam.cpp TelValue.cpp ImageValue.cpp DateParam.cpp Makefile.am AgentParam.cpp AdrValue.cpp FloatValue.cpp 
+KDE_DIST=VCardEntity.cpp TextListValue.cpp ClassValue.cpp TextValue.cpp DateValue.cpp TelParam.cpp ImgValue.cpp Entity.cpp Param.cpp ImageParam.cpp AdrParam.cpp TextBinValue.cpp VCard.cpp SoundValue.cpp UTCValue.cpp RToken.cpp NValue.cpp TextParam.cpp LangValue.cpp AgentValue.cpp URIValue.cpp Enum.cpp GeoValue.cpp PhoneNumberValue.cpp SourceParam.cpp Makefile.in Value.cpp ContentLine.cpp OrgValue.cpp EmailParam.cpp TextBinParam.cpp TelValue.cpp ImageValue.cpp DateParam.cpp AgentParam.cpp Makefile.am AdrValue.cpp FloatValue.cpp 
 
 #>+ 2
 docs-am:
@@ -776,8 +782,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -82,6 +82,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -196,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@
@@ -224,6 +225,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -233,6 +235,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -261,6 +264,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -311,6 +315,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -368,6 +373,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -381,12 +387,12 @@
 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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -397,8 +403,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -419,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:
@@ -505,7 +511,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -722,8 +728,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/ldapkio/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/ldapkio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,9 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kabc_ldapkio_la_DEPENDENCIES = libkabc_ldapkio.la
+am__DEPENDENCIES_1 =
+kabc_ldapkio_la_DEPENDENCIES = libkabc_ldapkio.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kabc_ldapkio_la_OBJECTS = resourceldapkioplugin.lo
 #>- kabc_ldapkio_la_OBJECTS = $(am_kabc_ldapkio_la_OBJECTS)
 #>+ 1
@@ -74,9 +76,10 @@
 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)
+libkabc_ldapkio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/kresources/libkresources.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libkabc_ldapkio_la_OBJECTS = resourceldapkio.lo \
 	resourceldapkioconfig.lo
 #>- libkabc_ldapkio_la_OBJECTS = $(am_libkabc_ldapkio_la_OBJECTS)
@@ -138,6 +141,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -252,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@
@@ -280,6 +284,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -289,6 +294,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -317,6 +323,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -367,6 +374,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -424,6 +432,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -438,12 +447,12 @@
 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
-libkabc_ldapkio_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDEUI) $(LIB_KDECORE)
 libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 kde_module_LTLIBRARIES = kabc_ldapkio.la
 kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp
 kabc_ldapkio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_ldapkio_la_LIBADD = libkabc_ldapkio.la
+kabc_ldapkio_la_LIBADD = libkabc_ldapkio.la $(LIB_QT) $(LIB_KDECORE)
 #>- METASOURCES = AUTO
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourceldapkio.h
@@ -455,12 +464,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -471,8 +480,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,9 +502,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -632,7 +641,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -861,8 +870,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/ldapkio/ldapkio.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/ldapkio/ldapkio.desktop
@@ -8,3 +8,4 @@
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
 X-KDE-ResourceType=ldapkio
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/net/net.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/net/net.desktop
@@ -88,3 +88,4 @@
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
 X-KDE-ResourceType=net
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/net/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/net/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -135,6 +135,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -249,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@
@@ -277,6 +278,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -286,6 +288,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -314,6 +317,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -364,6 +368,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -421,6 +426,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -452,12 +458,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -468,8 +474,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -490,9 +496,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -629,7 +635,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -830,22 +836,22 @@
 .NOEXPORT:
 
 #>+ 3
-resourcenetconfig.moc: $(srcdir)/resourcenetconfig.h
-	$(MOC) $(srcdir)/resourcenetconfig.h -o resourcenetconfig.moc
+resourcenet.moc: $(srcdir)/resourcenet.h
+	$(MOC) $(srcdir)/resourcenet.h -o resourcenet.moc
 
 #>+ 2
-mocs: resourcenetconfig.moc
+mocs: resourcenet.moc
 
 #>+ 3
-resourcenet.moc: $(srcdir)/resourcenet.h
-	$(MOC) $(srcdir)/resourcenet.h -o resourcenet.moc
+resourcenetconfig.moc: $(srcdir)/resourcenetconfig.h
+	$(MOC) $(srcdir)/resourcenetconfig.h -o resourcenetconfig.moc
 
 #>+ 2
-mocs: resourcenet.moc
+mocs: resourcenetconfig.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  resourcenetconfig.moc resourcenet.moc
+	-rm -f  resourcenet.moc resourcenetconfig.moc
 
 #>+ 2
 KDE_DIST=net.desktop Makefile.in Makefile.am 
@@ -858,8 +864,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -892,7 +898,7 @@
 
 
 #>+ 11
-libkabc_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcenet.cpp $(srcdir)/resourcenetconfig.cpp  resourcenet.moc resourcenetconfig.moc
+libkabc_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcenet.cpp $(srcdir)/resourcenetconfig.cpp  resourcenetconfig.moc resourcenet.moc
 	@echo 'creating libkabc_net_la.all_cpp.cpp ...'; \
 	rm -f libkabc_net_la.all_cpp.files libkabc_net_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkabc_net_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/dir/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/dir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,9 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kabc_dir_la_DEPENDENCIES = libkabc_dir.la
+am__DEPENDENCIES_1 =
+kabc_dir_la_DEPENDENCIES = libkabc_dir.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kabc_dir_la_OBJECTS = resourcedirplugin.lo
 #>- kabc_dir_la_OBJECTS = $(am_kabc_dir_la_OBJECTS)
 #>+ 1
@@ -74,8 +76,11 @@
 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)
+libkabc_dir_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/kresources/libkresources.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkabc_dir_la_OBJECTS = resourcedir.lo resourcedirconfig.lo
 #>- libkabc_dir_la_OBJECTS = $(am_libkabc_dir_la_OBJECTS)
 #>+ 4
@@ -134,6 +139,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -248,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@
@@ -276,6 +282,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -285,6 +292,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -313,6 +321,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -363,6 +372,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -420,6 +430,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -434,12 +445,12 @@
 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 
-libkabc_dir_la_LIBADD = $(LIB_KABC)
+libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
 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
-kabc_dir_la_LIBADD = libkabc_dir.la
+kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE)
 #>- METASOURCES = AUTO
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourcedir.h
@@ -451,12 +462,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -467,8 +478,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -489,9 +500,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -628,7 +639,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -857,8 +868,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/dir/dir.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/dir/dir.desktop
@@ -90,3 +90,4 @@
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
 X-KDE-ResourceType=dir
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/file/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/file/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -62,7 +62,9 @@
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kabc_file_la_DEPENDENCIES = libkabc_file.la
+am__DEPENDENCIES_1 =
+kabc_file_la_DEPENDENCIES = libkabc_file.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kabc_file_la_OBJECTS = resourcefileplugin.lo
 #>- kabc_file_la_OBJECTS = $(am_kabc_file_la_OBJECTS)
 #>+ 1
@@ -74,8 +76,11 @@
 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)
+libkabc_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/kresources/libkresources.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkabc_file_la_OBJECTS = resourcefile.lo resourcefileconfig.lo
 #>- libkabc_file_la_OBJECTS = $(am_libkabc_file_la_OBJECTS)
 #>+ 4
@@ -134,6 +139,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -248,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@
@@ -276,6 +282,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -285,6 +292,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -313,6 +321,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -363,6 +372,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -420,6 +430,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -434,12 +445,12 @@
 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
-libkabc_file_la_LIBADD = $(LIB_KABC)
+libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_KDECORE) $(LIB_KDEUI)
 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
-kabc_file_la_LIBADD = libkabc_file.la
+kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_KDECORE)
 kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 #>- METASOURCES = AUTO
 kabcincludedir = $(includedir)/kabc
@@ -452,12 +463,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -468,8 +479,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -490,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -629,7 +640,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -856,8 +867,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/file/file.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/file/file.desktop
@@ -80,3 +80,4 @@
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
 X-KDE-ResourceType=file
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/sql/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/sql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -118,6 +118,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -232,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@
@@ -260,6 +261,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -269,6 +271,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -297,6 +300,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -347,6 +351,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -404,6 +409,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -429,12 +435,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -445,8 +451,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -467,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -559,7 +565,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -762,7 +768,7 @@
 	-rm -f  resourcesqlconfig.moc
 
 #>+ 2
-KDE_DIST=Makefile.in Makefile.am sql.desktop 
+KDE_DIST=Makefile.in sql.desktop Makefile.am 
 
 #>+ 2
 docs-am:
@@ -772,8 +778,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/sql/sql.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/sql/sql.desktop
@@ -8,3 +8,4 @@
 [Plugin]
 Type=sql
 X-KDE-Library=kabc_sql
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/evolution/evolution.desktop
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/evolution/evolution.desktop
@@ -24,3 +24,4 @@
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
 X-KDE-ResourceType=evolution
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kabc/plugins/evolution/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kabc/plugins/evolution/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -121,6 +121,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -235,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@
@@ -263,6 +264,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -272,6 +274,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -300,6 +303,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -350,6 +354,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -407,6 +412,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -431,12 +437,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -447,8 +453,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -469,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
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -561,7 +567,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -763,8 +769,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/knewstuff/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/knewstuff/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -67,7 +67,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libknewstuff_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libknewstuff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libknewstuff_la_OBJECTS = engine.lo entry.lo downloaddialog.lo \
 	uploaddialog.lo providerdialog.lo provider.lo knewstuff.lo \
 	knewstuffgeneric.lo knewstuffbutton.lo knewstuffsecure.lo \
@@ -173,6 +175,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -287,7 +291,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,6 +318,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -324,6 +328,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -352,6 +357,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -402,6 +408,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -459,6 +466,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -470,7 +478,7 @@
 #>- METASOURCES = AUTO
 lib_LTLIBRARIES = libknewstuff.la
 libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-libknewstuff_la_LIBADD = $(LIB_KIO)
+libknewstuff_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
@@ -497,12 +505,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -513,8 +521,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -535,9 +543,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -710,7 +718,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1037,18 +1045,18 @@
 mocs: knewstuffsecure.moc
 
 #>+ 3
-engine.moc: $(srcdir)/engine.h
-	$(MOC) $(srcdir)/engine.h -o engine.moc
+uploaddialog.moc: $(srcdir)/uploaddialog.h
+	$(MOC) $(srcdir)/uploaddialog.h -o uploaddialog.moc
 
 #>+ 2
-mocs: engine.moc
+mocs: uploaddialog.moc
 
 #>+ 3
-uploaddialog.moc: $(srcdir)/uploaddialog.h
-	$(MOC) $(srcdir)/uploaddialog.h -o uploaddialog.moc
+engine.moc: $(srcdir)/engine.h
+	$(MOC) $(srcdir)/engine.h -o engine.moc
 
 #>+ 2
-mocs: uploaddialog.moc
+mocs: engine.moc
 
 #>+ 3
 security.moc: $(srcdir)/security.h
@@ -1073,7 +1081,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  provider.moc providerdialog.moc ghns.moc testnewstuff.moc knewstuffsecure.moc engine.moc uploaddialog.moc security.moc downloaddialog.moc knewstuffbutton.moc
+	-rm -f  provider.moc providerdialog.moc ghns.moc testnewstuff.moc knewstuffsecure.moc uploaddialog.moc engine.moc security.moc downloaddialog.moc knewstuffbutton.moc
 
 #>+ 2
 KDE_DIST=Makefile.in khotnewstuffrc README.knewstuff cr32-action-knewstuff.png types cr64-action-knewstuff.png cr16-action-knewstuff.png Makefile.am 
@@ -1083,25 +1091,25 @@
 
 #>+ 13
 install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
-	$(INSTALL_DATA) $(srcdir)/cr64-action-knewstuff.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/knewstuff.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/cr32-action-knewstuff.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/knewstuff.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
 	$(INSTALL_DATA) $(srcdir)/cr16-action-knewstuff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/knewstuff.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+	$(INSTALL_DATA) $(srcdir)/cr32-action-knewstuff.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/knewstuff.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
+	$(INSTALL_DATA) $(srcdir)/cr64-action-knewstuff.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/knewstuff.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/knewstuff.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/knewstuff.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/knewstuff.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/knewstuff.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/knewstuff.png
 
 #>+ 15
 force-reedit:
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1134,7 +1142,7 @@
 
 
 #>+ 11
-libknewstuff_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/engine.cpp $(srcdir)/entry.cpp $(srcdir)/downloaddialog.cpp $(srcdir)/uploaddialog.cpp $(srcdir)/providerdialog.cpp $(srcdir)/provider.cpp $(srcdir)/knewstuff.cpp $(srcdir)/knewstuffgeneric.cpp $(srcdir)/knewstuffbutton.cpp $(srcdir)/knewstuffsecure.cpp $(srcdir)/security.cpp  provider.moc providerdialog.moc knewstuffsecure.moc engine.moc uploaddialog.moc security.moc knewstuffbutton.moc downloaddialog.moc
+libknewstuff_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/engine.cpp $(srcdir)/entry.cpp $(srcdir)/downloaddialog.cpp $(srcdir)/uploaddialog.cpp $(srcdir)/providerdialog.cpp $(srcdir)/provider.cpp $(srcdir)/knewstuff.cpp $(srcdir)/knewstuffgeneric.cpp $(srcdir)/knewstuffbutton.cpp $(srcdir)/knewstuffsecure.cpp $(srcdir)/security.cpp  provider.moc providerdialog.moc knewstuffsecure.moc uploaddialog.moc engine.moc security.moc knewstuffbutton.moc downloaddialog.moc
 	@echo 'creating libknewstuff_la.all_cpp.cpp ...'; \
 	rm -f libknewstuff_la.all_cpp.files libknewstuff_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libknewstuff_la.all_cpp.final; \
@@ -1173,8 +1181,8 @@
 provider.lo: provider.moc 
 knewstuffsecure.lo: knewstuffsecure.moc 
 providerdialog.lo: providerdialog.moc 
-uploaddialog.lo: uploaddialog.moc 
 engine.lo: engine.moc 
+uploaddialog.lo: uploaddialog.moc 
 downloaddialog.lo: downloaddialog.moc 
 security.o: security.moc 
 knewstuffsecure.o: knewstuffsecure.moc 
--- kdelibs-3.5.10.dfsg.1.orig/kunittest/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kunittest/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -79,7 +79,8 @@
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(kunittest_samplemodule_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
-libkunittest_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkunittest_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libkunittest_la_OBJECTS = runner.lo tester.lo
 #>- libkunittest_la_OBJECTS = $(am_libkunittest_la_OBJECTS)
 #>+ 4
@@ -153,6 +154,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -267,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,6 +297,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -304,6 +307,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -332,6 +336,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -382,6 +387,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -439,6 +445,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -451,7 +458,7 @@
 lib_LTLIBRARIES = libkunittest.la
 libkunittest_la_SOURCES = runner.cpp tester.cpp
 libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
-libkunittest_la_LIBADD = $(LIB_KDECORE)
+libkunittest_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 libkunittestinclude_HEADERS = runner.h tester.h module.h
 libkunittestincludedir = $(includedir)/kunittest
 kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -470,12 +477,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -486,8 +493,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -508,9 +515,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:
@@ -644,7 +651,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -960,8 +967,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
--- kdelibs-3.5.10.dfsg.1.orig/kparts/krop.desktop
+++ kdelibs-3.5.10.dfsg.1/kparts/krop.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=KDE 元件
 Comment[zh_TW]=KDE 元件
 Comment[zu]=Ingxenye ye-KDE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kparts/browserview.desktop
+++ kdelibs-3.5.10.dfsg.1/kparts/browserview.desktop
@@ -155,3 +155,4 @@
 # ($KDEDIR/share/apps)
 [PropertyDef::X-KDE-BrowserView-PluginsInfo]
 Type=QString
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kparts/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kparts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -64,7 +64,9 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libkparts_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libkparts_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la
 am_libkparts_la_OBJECTS = part.lo plugin.lo partmanager.lo \
 	mainwindow.lo dockmainwindow.lo event.lo browserextension.lo \
 	factory.lo historyprovider.lo browserinterface.lo \
@@ -129,6 +131,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -243,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@
@@ -271,6 +274,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -280,6 +284,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -308,6 +313,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -358,6 +364,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -415,6 +422,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -427,7 +435,7 @@
 	-I$(top_srcdir)/kfile $(all_includes)
 
 libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-libkparts_la_LIBADD = $(LIB_KIO)
+libkparts_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 
 ####### Files
 lib_LTLIBRARIES = libkparts.la
@@ -450,12 +458,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -466,8 +474,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -488,9 +496,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -607,7 +615,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -892,11 +900,11 @@
 .NOEXPORT:
 
 #>+ 3
-factory.moc: $(srcdir)/factory.h
-	$(MOC) $(srcdir)/factory.h -o factory.moc
+dockmainwindow.moc: $(srcdir)/dockmainwindow.h
+	$(MOC) $(srcdir)/dockmainwindow.h -o dockmainwindow.moc
 
 #>+ 2
-mocs: factory.moc
+mocs: dockmainwindow.moc
 
 #>+ 3
 plugin.moc: $(srcdir)/plugin.h
@@ -906,11 +914,11 @@
 mocs: plugin.moc
 
 #>+ 3
-dockmainwindow.moc: $(srcdir)/dockmainwindow.h
-	$(MOC) $(srcdir)/dockmainwindow.h -o dockmainwindow.moc
+factory.moc: $(srcdir)/factory.h
+	$(MOC) $(srcdir)/factory.h -o factory.moc
 
 #>+ 2
-mocs: dockmainwindow.moc
+mocs: factory.moc
 
 #>+ 3
 historyprovider.moc: $(srcdir)/historyprovider.h
@@ -941,18 +949,18 @@
 mocs: partmanager.moc
 
 #>+ 3
-mainwindow.moc: $(srcdir)/mainwindow.h
-	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+browserrun.moc: $(srcdir)/browserrun.h
+	$(MOC) $(srcdir)/browserrun.h -o browserrun.moc
 
 #>+ 2
-mocs: mainwindow.moc
+mocs: browserrun.moc
 
 #>+ 3
-browserrun.moc: $(srcdir)/browserrun.h
-	$(MOC) $(srcdir)/browserrun.h -o browserrun.moc
+mainwindow.moc: $(srcdir)/mainwindow.h
+	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
 
 #>+ 2
-mocs: browserrun.moc
+mocs: mainwindow.moc
 
 #>+ 3
 browserinterface.moc: $(srcdir)/browserinterface.h
@@ -970,7 +978,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  factory.moc plugin.moc dockmainwindow.moc historyprovider.moc statusbarextension.moc part.moc partmanager.moc mainwindow.moc browserrun.moc browserinterface.moc browserextension.moc
+	-rm -f  dockmainwindow.moc plugin.moc factory.moc historyprovider.moc statusbarextension.moc part.moc partmanager.moc browserrun.moc mainwindow.moc browserinterface.moc browserextension.moc
 
 #>+ 2
 KDE_DIST=krop.desktop Makefile.in COMMENTS design.h krwp.desktop kpart.desktop browserview.desktop Makefile.am 
@@ -983,8 +991,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -1017,7 +1025,7 @@
 
 
 #>+ 11
-libkparts_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/part.cpp $(srcdir)/plugin.cpp $(srcdir)/partmanager.cpp $(srcdir)/mainwindow.cpp $(srcdir)/dockmainwindow.cpp $(srcdir)/event.cpp $(srcdir)/browserextension.cpp $(srcdir)/factory.cpp $(srcdir)/historyprovider.cpp $(srcdir)/browserinterface.cpp $(srcdir)/browserrun.cpp $(srcdir)/statusbarextension.cpp  dockmainwindow.moc plugin.moc factory.moc historyprovider.moc statusbarextension.moc part.moc partmanager.moc browserrun.moc mainwindow.moc browserinterface.moc browserextension.moc
+libkparts_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/part.cpp $(srcdir)/plugin.cpp $(srcdir)/partmanager.cpp $(srcdir)/mainwindow.cpp $(srcdir)/dockmainwindow.cpp $(srcdir)/event.cpp $(srcdir)/browserextension.cpp $(srcdir)/factory.cpp $(srcdir)/historyprovider.cpp $(srcdir)/browserinterface.cpp $(srcdir)/browserrun.cpp $(srcdir)/statusbarextension.cpp  factory.moc plugin.moc dockmainwindow.moc historyprovider.moc statusbarextension.moc part.moc partmanager.moc mainwindow.moc browserrun.moc browserinterface.moc browserextension.moc
 	@echo 'creating libkparts_la.all_cpp.cpp ...'; \
 	rm -f libkparts_la.all_cpp.files libkparts_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
--- kdelibs-3.5.10.dfsg.1.orig/kparts/kpart.desktop
+++ kdelibs-3.5.10.dfsg.1/kparts/kpart.desktop
@@ -83,3 +83,4 @@
 Comment[zh_HK]=KDE 元件
 Comment[zh_TW]=KDE 元件
 Comment[zu]=Ingxenye ye-KDE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kparts/krwp.desktop
+++ kdelibs-3.5.10.dfsg.1/kparts/krwp.desktop
@@ -84,3 +84,4 @@
 Comment[zh_HK]=KDE 元件
 Comment[zh_TW]=KDE 元件
 Comment[zu]=Ingxenye ye-KDE
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kparts/tests/notepad.desktop
+++ kdelibs-3.5.10.dfsg.1/kparts/tests/notepad.desktop
@@ -84,3 +84,4 @@
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=libnotepadpart
 Type=Service
+X-Ubuntu-Gettext-Domain=desktop_kdelibs
--- kdelibs-3.5.10.dfsg.1.orig/kparts/tests/Makefile.in
+++ kdelibs-3.5.10.dfsg.1/kparts/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
@@ -165,6 +165,8 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -279,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@
@@ -307,6 +308,7 @@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
+LIB_QT_EXT = @LIB_QT_EXT@
 LIB_SMB = @LIB_SMB@
 LIB_X11 = @LIB_X11@
 LIB_XEXT = @LIB_XEXT@
@@ -316,6 +318,7 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -344,6 +347,7 @@
 QT_INCLUDES = @QT_INCLUDES@
 QT_LDFLAGS = @QT_LDFLAGS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL_INCLUDES = @SSL_INCLUDES@
@@ -394,6 +398,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -451,6 +456,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_includes = @x_includes@
@@ -496,12 +502,12 @@
 
 .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*) \
-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-#>- 		&& exit 0; \
+#>- 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+#>- 	        && { if test -f $@; then exit 0; else break; fi; }; \
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
@@ -512,8 +518,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -534,9 +540,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -728,7 +734,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -944,18 +950,18 @@
 mocs: normalktm.moc
 
 #>+ 3
-example.moc: $(srcdir)/example.h
-	$(MOC) $(srcdir)/example.h -o example.moc
+notepad.moc: $(srcdir)/notepad.h
+	$(MOC) $(srcdir)/notepad.h -o notepad.moc
 
 #>+ 2
-mocs: example.moc
+mocs: notepad.moc
 
 #>+ 3
-notepad.moc: $(srcdir)/notepad.h
-	$(MOC) $(srcdir)/notepad.h -o notepad.moc
+example.moc: $(srcdir)/example.h
+	$(MOC) $(srcdir)/example.h -o example.moc
 
 #>+ 2
-mocs: notepad.moc
+mocs: example.moc
 
 #>+ 3
 parts.moc: $(srcdir)/parts.h
@@ -973,7 +979,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  ghostview.moc normalktm.moc example.moc notepad.moc parts.moc plugin_spellcheck.moc
+	-rm -f  ghostview.moc normalktm.moc notepad.moc example.moc parts.moc plugin_spellcheck.moc
 
 #>+ 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 
@@ -986,8 +992,8 @@
 		@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \