rev 3376 - trunk/packages/kdelibs/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Tue Mar 28 18:34:10 UTC 2006


Author: chrsmrtn
Date: 2006-03-28 18:33:55 +0000 (Tue, 28 Mar 2006)
New Revision: 3376

Modified:
   trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
New 3.5.2 buildprep.


Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff	2006-03-28 18:30:32 UTC (rev 3375)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff	2006-03-28 18:33:55 UTC (rev 3376)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5917,30 +5905,15 @@
+@@ -5970,30 +5958,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -60,11 +60,11 @@
 +## modifications, as long as this notice is preserved.
  
 -# serial 47 AC_PROG_LIBTOOL
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6000,7 +5973,7 @@
+@@ -6053,7 +6026,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6050,7 +6023,7 @@
+@@ -6103,7 +6076,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6070,7 +6043,7 @@
+@@ -6123,7 +6096,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,26 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6118,6 +6091,8 @@
+@@ -6143,6 +6116,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"
+@@ -6162,15 +6136,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -100,7 +119,15 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6163,6 +6138,48 @@
+@@ -6211,11 +6187,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
  ])# _LT_AC_SYS_COMPILER
  
  
@@ -127,7 +154,7 @@
 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
 +[ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +])# _LT_COMPILER_BOILERPLATE
@@ -140,7 +167,7 @@
 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
 +[ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +])# _LT_LINKER_BOILERPLATE
@@ -149,7 +176,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6235,15 +6252,15 @@
+@@ -6288,15 +6309,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -168,7 +195,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6412,14 +6429,13 @@
+@@ -6465,14 +6486,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -185,7 +212,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6431,7 +6447,6 @@
+@@ -6484,7 +6504,6 @@
        esac
        ;;
      *64-bit*)
@@ -193,7 +220,30 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6496,7 +6511,7 @@
+@@ -6518,6 +6537,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)
+@@ -6549,7 +6584,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -202,20 +252,20 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6506,8 +6521,10 @@
+@@ -6559,8 +6594,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # 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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -6533,11 +6550,16 @@
+@@ -6586,11 +6623,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -225,15 +275,15 @@
       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 > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
++       $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
-@@ -6561,7 +6583,7 @@
+@@ -6614,7 +6656,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -242,7 +292,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6590,20 +6612,53 @@
+@@ -6643,20 +6685,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -266,6 +316,12 @@
 +    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
@@ -279,6 +335,17 @@
 +      esac
 +    fi
 +    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
 +  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
@@ -302,7 +369,32 @@
      # 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.
-@@ -6699,7 +6754,7 @@
+@@ -6673,7 +6765,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6681,7 +6773,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 :
+@@ -6747,17 +6839,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
@@ -311,7 +403,22 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) $1 ;;
-@@ -6753,7 +6808,7 @@
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -6769,7 +6863,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
+@@ -6806,7 +6900,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -320,7 +427,25 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6842,20 +6897,13 @@
+@@ -6840,7 +6934,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"
+@@ -6853,7 +6947,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(
+@@ -6895,20 +6989,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -342,14 +467,14 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6867,13 +6915,18 @@
+@@ -6920,13 +7007,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
 -     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -365,7 +490,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6932,8 +6985,8 @@
+@@ -6985,8 +7077,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -376,7 +501,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6990,7 +7043,7 @@
+@@ -7043,7 +7135,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -385,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7003,7 +7056,7 @@
+@@ -7056,7 +7148,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -394,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7013,7 +7066,20 @@
+@@ -7066,7 +7158,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -416,7 +541,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7078,7 +7144,7 @@
+@@ -7131,7 +7236,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -425,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7087,7 +7153,7 @@
+@@ -7140,7 +7245,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -434,7 +559,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7103,7 +7169,7 @@
+@@ -7156,7 +7261,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -443,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7115,7 +7181,8 @@
+@@ -7168,7 +7273,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -453,7 +578,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7145,7 +7212,7 @@
+@@ -7198,7 +7304,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -462,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7168,7 +7235,7 @@
+@@ -7221,7 +7327,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -471,19 +596,22 @@
    # 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"`
-@@ -7191,7 +7258,7 @@
+@@ -7244,20 +7350,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -7203,8 +7270,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -500,7 +628,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7222,7 +7298,7 @@
+@@ -7275,14 +7378,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -509,7 +637,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -7249,9 +7325,9 @@
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -7302,9 +7410,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -521,7 +662,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7266,7 +7342,7 @@
+@@ -7319,7 +7427,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -530,7 +671,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7277,7 +7353,7 @@
+@@ -7330,7 +7438,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -539,7 +680,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7339,22 +7415,19 @@
+@@ -7342,6 +7450,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -7385,29 +7505,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'
@@ -568,7 +736,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7364,6 +7437,30 @@
+@@ -7417,6 +7534,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -584,22 +752,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7373,7 +7470,7 @@
+@@ -7426,7 +7555,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -608,9 +764,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7402,7 +7499,11 @@
+@@ -7454,8 +7583,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.
@@ -621,7 +779,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7422,7 +7523,7 @@
+@@ -7475,7 +7609,7 @@
  
  os2*)
    libname_spec='$name'
@@ -630,8 +788,83 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7568,7 +7669,9 @@
+@@ -7493,13 +7627,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
  
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -7525,7 +7652,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'
+@@ -7558,6 +7685,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}'
+@@ -7571,6 +7721,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -7595,6 +7750,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.
+@@ -7621,7 +7779,9 @@
+ 
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -641,7 +874,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7630,7 +7733,7 @@
+@@ -7683,7 +7843,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -650,7 +883,16 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7804,7 +7907,7 @@
+@@ -7721,7 +7881,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)
+@@ -7857,7 +8017,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -659,7 +901,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -7914,7 +8017,7 @@
+@@ -7967,7 +8127,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,
@@ -668,7 +910,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7946,7 +8049,7 @@
+@@ -7999,7 +8159,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,
@@ -677,14 +919,14 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7973,6 +8076,15 @@
+@@ -8026,6 +8186,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='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
@@ -693,7 +935,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8006,44 +8118,36 @@
+@@ -8059,44 +8228,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -738,7 +980,7 @@
    ;;
  
 -freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
@@ -749,7 +991,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8059,7 +8163,7 @@
+@@ -8112,7 +8273,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -758,9 +1000,15 @@
    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
-@@ -8076,42 +8180,21 @@
+@@ -8128,43 +8289,27 @@
+   esac
    ;;
  
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
  irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -  irix5* | nonstopux*)
@@ -788,7 +1036,7 @@
    ;;
  
  # This must be Linux ELF.
- linux*)
+-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 ;;
@@ -800,15 +1048,16 @@
 -    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 | knetbsd*-gnu)
++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
-@@ -8130,19 +8213,14 @@
+@@ -8183,32 +8328,22 @@
    ;;
  
  openbsd*)
@@ -827,18 +1076,107 @@
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
 -  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8152,7 +8230,6 @@
- 
  solaris*)
    lt_cv_deplibs_check_method=pass_all
 -  lt_cv_file_magic_test_file=/lib/libc.so
    ;;
  
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8260,13 +8337,13 @@
+-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]]'
+@@ -8229,10 +8364,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
+@@ -8252,36 +8390,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"
+@@ -8313,13 +8458,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -859,7 +1197,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8285,13 +8362,13 @@
+@@ -8338,13 +8483,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -880,7 +1218,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8329,10 +8406,21 @@
+@@ -8382,10 +8527,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -890,7 +1228,7 @@
  ])# _LT_AC_LANG_CXX
  
 +# _LT_AC_PROG_CXXCPP
-+# ---------------
++# ------------------
 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
 +[
 +AC_REQUIRE([AC_PROG_CXX])
@@ -903,28 +1241,69 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8405,6 +8493,10 @@
+@@ -8425,7 +8581,7 @@
  
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8458,36 +8614,9 @@
+ 
  _LT_AC_SYS_COMPILER
  
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+-  else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8418,7 +8510,7 @@
- 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 :
-+  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
-@@ -8459,7 +8551,7 @@
  
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8501,9 +8630,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])
+ 
+@@ -8512,7 +8641,7 @@
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -932,7 +1311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8468,48 +8560,11 @@
+@@ -8521,48 +8650,11 @@
    fi
    ;;
  
@@ -983,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8534,7 +8589,7 @@
+@@ -8587,7 +8679,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -992,7 +1371,15 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8563,7 +8618,7 @@
+@@ -8599,6 +8691,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)=
+@@ -8616,7 +8709,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1001,7 +1388,13 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8578,6 +8633,10 @@
+@@ -8626,11 +8719,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+ 
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1012,7 +1405,20 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8599,7 +8658,7 @@
+@@ -8641,18 +8738,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
@@ -1021,7 +1427,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8617,8 +8676,8 @@
+@@ -8670,8 +8767,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
@@ -1032,7 +1438,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8644,7 +8703,7 @@
+@@ -8697,7 +8794,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.
@@ -1041,12 +1447,15 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8674,8 +8733,22 @@
+@@ -8727,11 +8824,26 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
 -      # KDE requires run time linking.  Make it the default.
 -      aix_use_runtimelinking=yes
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
 +      aix_use_runtimelinking=no
 +
 +      # Test if we are trying to use run time linking or normal
@@ -1061,12 +1470,16 @@
 +	    ;;
 +	  esac
 +	done
++	;;
 +      esac
 +
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-     fi
-@@ -8692,7 +8765,7 @@
++      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
+@@ -8745,7 +8857,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1075,8 +1488,11 @@
        # 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`
-@@ -8713,6 +8786,9 @@
+@@ -8764,8 +8876,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
@@ -1085,7 +1501,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8721,15 +8797,16 @@
+@@ -8774,15 +8890,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1106,39 +1522,55 @@
      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.
-@@ -8738,13 +8815,12 @@
+@@ -8791,13 +8908,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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${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
-@@ -8758,8 +8834,8 @@
+@@ -8806,16 +8922,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)=' '
++	_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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	_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
      ;;
-@@ -8772,16 +8848,17 @@
-     esac
-     ;;
- 
 +
-   cygwin* | mingw* | pw32*)
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _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
+       *)
+@@ -8829,12 +8955,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'
@@ -1149,16 +1581,16 @@
  
      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}--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
-@@ -8790,70 +8867,81 @@
+@@ -8843,70 +8969,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}--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
@@ -1287,7 +1719,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8864,14 +8952,14 @@
+@@ -8917,14 +9054,14 @@
  	;;
      esac
      ;;
@@ -1300,11 +1732,11 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
 -  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8888,12 +8976,12 @@
+@@ -8941,12 +9078,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1320,7 +1752,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8902,11 +8990,11 @@
+@@ -8955,11 +9092,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.
@@ -1334,25 +1766,48 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8916,7 +9004,7 @@
+@@ -8969,33 +9106,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
 -      case "$host_cpu" in
+-      hppa*64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
 +      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      hppa*64*|ia64*)
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8932,7 +9020,7 @@
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
          ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
        esac
      fi
 -    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
 +    case $host_cpu in
-     hppa*64*)
++    hppa*64*|ia64*)
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8953,17 +9041,17 @@
+-      _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
+@@ -9006,17 +9132,20 @@
      esac
  
      case $cc_basename in
@@ -1363,10 +1818,15 @@
  	;;
 -      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*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	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'
@@ -1374,14 +1834,19 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8979,12 +9067,12 @@
+@@ -9032,12 +9161,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
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    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'
@@ -1389,8 +1854,24 @@
  	      ;;
  	    esac
  	  fi
-@@ -8997,9 +9085,9 @@
+@@ -9048,11 +9180,25 @@
+ 	;;
+     esac
      ;;
++  interix3*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
    irix5* | irix6*)
      case $cc_basename in
 -      CC)
@@ -1401,7 +1882,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9010,9 +9098,9 @@
+@@ -9063,9 +9209,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1413,9 +1894,12 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9023,14 +9111,14 @@
+@@ -9074,16 +9220,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
-   linux*)
+-  linux*)
++  linux* | k*bsd*-gnu)
      case $cc_basename in
 -      KCC)
 +      KCC*)
@@ -1431,7 +1915,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9048,20 +9136,44 @@
+@@ -9101,20 +9247,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1482,7 +1966,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9089,7 +9201,7 @@
+@@ -9142,7 +9312,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1491,16 +1975,16 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9099,7 +9211,7 @@
+@@ -9152,7 +9322,7 @@
  	;;
      esac
      ;;
 -  netbsd*)
-+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++  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=
-@@ -9110,15 +9222,31 @@
+@@ -9163,15 +9333,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -1534,7 +2018,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9128,14 +9256,14 @@
+@@ -9181,14 +9367,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -1552,7 +2036,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9153,7 +9281,7 @@
+@@ -9206,7 +9392,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1561,7 +2045,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9172,13 +9300,13 @@
+@@ -9225,13 +9411,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -1577,7 +2061,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9187,17 +9315,17 @@
+@@ -9240,17 +9426,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -1599,7 +2083,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9216,7 +9344,7 @@
+@@ -9269,7 +9455,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1608,17 +2092,23 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,7 +9368,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
+@@ -9290,27 +9476,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)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -9252,12 +9380,12 @@
-     ;;
+-	# 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)
@@ -1632,7 +2122,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9270,36 +9398,33 @@
+@@ -9323,36 +9496,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -1681,7 +2171,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9307,9 +9432,9 @@
+@@ -9360,9 +9530,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -1693,7 +2183,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9319,9 +9444,9 @@
+@@ -9372,9 +9542,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
@@ -1705,7 +2195,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9330,9 +9455,9 @@
+@@ -9383,9 +9553,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1717,8 +2207,65 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9350,7 +9475,7 @@
+@@ -9398,12 +9568,63 @@
+ 	;;
+     esac
      ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
    tandem*)
      case $cc_basename in
 -      NCC)
@@ -1726,7 +2273,25 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9460,7 +9585,7 @@
+@@ -9440,8 +9661,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)
+ 
+@@ -9459,7 +9678,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
+@@ -9513,7 +9732,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.
@@ -1735,7 +2300,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9500,7 +9625,7 @@
+@@ -9553,7 +9772,7 @@
         fi
         ;;
  
@@ -1744,13 +2309,21 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9536,6 +9661,21 @@
+@@ -9589,13 +9808,37 @@
  
  $rm -f confest.$objext
  
 +# PORTME: override above test on systems where it is broken
 +ifelse([$1],[CXX],
 +[case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
 +solaris*)
 +  case $cc_basename in
 +  CC*)
@@ -1760,13 +2333,22 @@
 +    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
 +    ;;
 +  esac
++  ;;
 +esac
 +])
 +
  case " $_LT_AC_TAGVAR(postdeps, $1) " in
  *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
  esac
-@@ -9586,12 +9726,16 @@
+ ])# 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'.
+@@ -9639,12 +9882,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1784,7 +2366,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9601,7 +9745,7 @@
+@@ -9654,7 +9901,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1793,7 +2375,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9609,8 +9753,10 @@
+@@ -9662,8 +9909,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1806,7 +2388,25 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9661,20 +9807,27 @@
+@@ -9673,8 +9922,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"
+ 
+@@ -9684,8 +9931,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)
+ 
+@@ -9714,20 +9959,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -1835,7 +2435,25 @@
  ## 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
-@@ -9721,11 +9874,16 @@
+@@ -9739,8 +9991,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)
+ 
+@@ -9750,7 +10000,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'.
+@@ -9774,11 +10024,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1852,7 +2470,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9751,11 +9909,12 @@
+@@ -9804,11 +10059,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1862,12 +2480,12 @@
    # 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 NM \
++  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 \
-@@ -9805,7 +9964,7 @@
+@@ -9858,7 +10114,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1876,7 +2494,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9871,11 +10030,11 @@
+@@ -9924,11 +10180,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1890,7 +2508,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9906,6 +10065,12 @@
+@@ -9959,6 +10215,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -1903,7 +2521,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9936,7 +10101,7 @@
+@@ -9970,6 +10232,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -9989,7 +10254,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1912,7 +2540,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9967,7 +10132,7 @@
+@@ -10020,7 +10285,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1921,7 +2549,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -9982,7 +10147,7 @@
+@@ -10035,7 +10300,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -1930,7 +2558,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10211,7 +10376,10 @@
+@@ -10264,7 +10529,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.
@@ -1942,7 +2570,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10253,9 +10421,6 @@
+@@ -10306,9 +10574,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -1952,11 +2580,11 @@
  # 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'"
  
-@@ -10277,6 +10442,13 @@
+@@ -10330,14 +10595,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*)
++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'"
@@ -1966,16 +2594,26 @@
  irix* | nonstopux*)
    symcode='[[BCDEGRST]]'
    ;;
-@@ -10284,7 +10456,7 @@
+ osf*)
    symcode='[[BCDEGQRST]]'
    ;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
 -  symcode='[[BDT]]'
++solaris*)
 +  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10302,14 +10474,17 @@
+@@ -10355,14 +10636,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1995,7 +2633,18 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10473,7 +10648,7 @@
+@@ -10518,6 +10802,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -10526,7 +10814,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2004,7 +2653,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10498,18 +10673,28 @@
+@@ -10551,18 +10839,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2036,12 +2685,12 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10517,22 +10702,22 @@
+@@ -10570,22 +10868,22 @@
  	    ;;
  	esac
  	;;
 -      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
@@ -2049,7 +2698,8 @@
 -	  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)="${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
@@ -2057,14 +2707,21 @@
 -	  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"
+-	    _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
  	      ;;
-@@ -10547,7 +10732,7 @@
+@@ -10598,9 +10896,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)
@@ -2072,9 +2729,12 @@
  	    _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.
-@@ -10558,18 +10743,24 @@
+@@ -10609,20 +10911,26 @@
+ 	    ;;
+ 	esac
  	;;
-       linux*)
+-      linux*)
++      linux* | k*bsd*-gnu)
  	case $cc_basename in
 -	  KCC)
 +	  KCC*)
@@ -2101,7 +2761,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10586,25 +10777,25 @@
+@@ -10639,25 +10947,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2114,7 +2774,7 @@
  	esac
  	;;
 -      netbsd*)
-+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      netbsd* | netbsdelf*-gnu)
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
@@ -2132,17 +2792,19 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10620,7 +10811,7 @@
+@@ -10671,24 +10979,15 @@
  	;;
-       sco*)
- 	case $cc_basename in
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -10629,13 +10820,13 @@
- 	;;
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
        solaris*)
  	case $cc_basename in
 -	  CC)
@@ -2157,7 +2819,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10645,12 +10836,12 @@
+@@ -10698,12 +10997,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2172,7 +2834,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10660,7 +10851,7 @@
+@@ -10713,7 +11012,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2181,7 +2843,35 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10731,7 +10922,7 @@
+@@ -10721,7 +11020,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*)
+ 	;;
+@@ -10768,6 +11074,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -10784,7 +11095,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2190,7 +2880,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10757,6 +10948,16 @@
+@@ -10810,6 +11121,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2207,7 +2897,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10768,7 +10969,7 @@
+@@ -10821,7 +11142,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.
@@ -2216,11 +2906,13 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10792,12 +10993,19 @@
+@@ -10844,13 +11165,20 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
-     linux*)
+-    linux*)
 -      case $CC in
++    linux* | k*bsd*-gnu)
 +      case $cc_basename in
        icc* | ecc*)
  	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -2237,9 +2929,15 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10818,9 +11026,14 @@
+@@ -10865,15 +11193,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
+-
      solaris*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -2253,10 +2951,25 @@
        ;;
  
      sunos4*)
-@@ -10842,6 +11055,11 @@
+@@ -10882,7 +11210,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'
+@@ -10895,6 +11223,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
@@ -2265,7 +2978,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10869,7 +11087,7 @@
+@@ -10922,7 +11261,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2274,19 +2987,36 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10902,7 +11120,10 @@
+@@ -10931,6 +11270,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)=])
+ ])
+ 
+ 
+@@ -10955,7 +11304,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*)
++  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'
-@@ -10928,7 +11149,7 @@
+@@ -10981,7 +11333,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -2295,7 +3025,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10945,7 +11166,8 @@
+@@ -10998,7 +11350,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -2305,7 +3035,18 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10965,6 +11187,27 @@
+@@ -11008,6 +11361,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
+     ;;
+@@ -11018,6 +11375,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -2333,7 +3074,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11002,7 +11245,7 @@
+@@ -11055,7 +11433,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -2342,7 +3083,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11012,13 +11255,13 @@
+@@ -11065,13 +11443,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'
@@ -2355,22 +3096,37 @@
  
        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}--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
-@@ -11027,19 +11270,51 @@
+@@ -11080,23 +11458,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
-+    linux*)
++    interix3*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -2404,7 +3160,7 @@
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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=
@@ -2416,7 +3172,12 @@
        fi
        ;;
  
-@@ -11057,8 +11332,8 @@
+-    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
+@@ -11110,13 +11535,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2427,8 +3188,40 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11073,24 +11348,19 @@
+       ;;
  
++    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=
+@@ -11126,24 +11578,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'
@@ -2459,7 +3252,16 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11124,9 +11394,20 @@
+@@ -11155,7 +11602,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
+@@ -11177,9 +11624,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
@@ -2475,6 +3277,7 @@
 +  	    break
 +  	  fi
 +	  done
++	  ;;
 +	esac
  
 -	# KDE requires run time linking.  Make it the default.
@@ -2482,7 +3285,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11143,7 +11424,7 @@
+@@ -11196,7 +11655,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -2491,8 +3294,11 @@
  	# 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`
-@@ -11164,6 +11445,9 @@
+@@ -11215,8 +11674,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
@@ -2501,16 +3307,19 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11172,29 +11456,29 @@
+@@ -11224,30 +11687,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
-   	if test "$aix_use_runtimelinking" = yes; then
+-  	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
        fi
  
@@ -2530,28 +3339,34 @@
 -	_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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${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
-@@ -11208,8 +11492,8 @@
+@@ -11256,13 +11719,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)=' '
++	  _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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  _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
        ;;
-@@ -11222,7 +11506,7 @@
+@@ -11275,7 +11736,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -2560,7 +3375,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11232,69 +11516,69 @@
+@@ -11285,69 +11746,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2676,18 +3491,18 @@
        ;;
  
      dgux*)
-@@ -11327,8 +11611,8 @@
+@@ -11380,8 +11841,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* | kfreebsd*-gnu | dragonfly*)
++    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
-@@ -11336,7 +11620,7 @@
+@@ -11389,7 +11850,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -2696,15 +3511,41 @@
        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
-@@ -11352,16 +11636,16 @@
+@@ -11403,47 +11864,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
  
-     hpux10* | hpux11*)
+-    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*|ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	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'
@@ -2713,21 +3554,52 @@
  	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*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	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'
  	  ;;
-@@ -11371,7 +11655,7 @@
+ 	*)
+-	  _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*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11404,7 +11688,7 @@
+-	  _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'
  
+@@ -11457,7 +11933,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'
@@ -2735,16 +3607,16 @@
        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'
-@@ -11414,7 +11698,7 @@
+@@ -11467,7 +11943,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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
-@@ -11437,7 +11721,8 @@
+@@ -11490,7 +11966,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -2754,7 +3626,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11447,7 +11732,7 @@
+@@ -11500,7 +11977,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -2763,7 +3635,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11458,14 +11743,14 @@
+@@ -11511,14 +11988,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
@@ -2780,7 +3652,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11477,13 +11762,13 @@
+@@ -11530,13 +12007,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}\*'
@@ -2796,7 +3668,18 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11502,10 +11787,12 @@
+@@ -11544,21 +12021,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
@@ -2811,7 +3694,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11514,8 +11801,18 @@
+@@ -11567,8 +12038,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2832,7 +3715,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11524,7 +11821,7 @@
+@@ -11577,7 +12058,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.
@@ -2841,19 +3724,86 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11584,9 +11881,9 @@
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+@@ -11625,36 +12106,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$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'
        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 ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_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'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11644,7 +11941,7 @@
++
++      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*)
+@@ -11672,11 +12162,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?
+ #
+@@ -11697,13 +12182,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2862,7 +3812,14 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11778,7 +12075,7 @@
+         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=
+@@ -11831,7 +12317,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3543,19 +4500,17 @@
  	@$(NORMAL_INSTALL)
 --- config.h.in
 +++ config.h.in
-@@ -1,5 +1,11 @@
- /* config.h.in.  Generated from configure.in by autoheader.  */
+@@ -3,6 +3,9 @@
+ /* Define where aspell data dir is */
+ #undef ASPELL_DATADIR
  
-+/* 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.
     */
-@@ -94,9 +100,6 @@
+@@ -97,9 +100,6 @@
  /* Define if your system has Linux Directory Notification */
  #undef HAVE_DNOTIFY
  
@@ -3565,7 +4520,7 @@
  /* Define if you have OpenEXR */
  #undef HAVE_EXR
  
-@@ -558,6 +561,9 @@
+@@ -561,6 +561,9 @@
  /* Define to 1 if you have the <sys/param.h> header file. */
  #undef HAVE_SYS_PARAM_H
  
@@ -3575,7 +4530,7 @@
  /* Define to 1 if you have the <sys/select.h> header file. */
  #undef HAVE_SYS_SELECT_H
  
-@@ -585,6 +591,12 @@
+@@ -588,6 +591,12 @@
  /* Define if sys/stat.h declares S_ISSOCK. */
  #undef HAVE_S_ISSOCK
  
@@ -3588,16 +4543,6 @@
  /* Define to 1 if you have the <termios.h> header file. */
  #undef HAVE_TERMIOS_H
  
-@@ -615,6 +627,9 @@
- /* Define to 1 if you have the <util.h> header file. */
- #undef HAVE_UTIL_H
- 
-+/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
-+#undef HAVE_VALGRIND_MEMCHECK_H
-+
- /* Define to 1 if you have the <values.h> header file. */
- #undef HAVE_VALUES_H
- 
 --- configure
 +++ configure
 @@ -278,15 +278,15 @@
@@ -3656,7 +4601,16 @@
    --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
-@@ -1122,6 +1127,7 @@
+@@ -1088,6 +1093,8 @@
+   --with-qt-includes=DIR  where the Qt includes are.
+   --with-qt-libraries=DIR where the Qt library is installed.
+   --without-arts          build without aRts default=no
++  --with-rgbfile=path     Define custom path for rgb.txt. (default:
++                          \$(x11libdir)/X11/rgb.txt)
+   --with-distribution     indicate the distribution in bug reports
+   --with-utempter         use utempter for utmp management
+                           [default=check]
+@@ -1122,6 +1129,7 @@
    CXXCPP      C++ preprocessor
    F77         Fortran 77 compiler command
    FFLAGS      Fortran 77 compiler flags
@@ -3664,7 +4618,7 @@
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -1214,7 +1220,7 @@
+@@ -1214,7 +1222,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -3673,7 +4627,7 @@
    done
  fi
  
-@@ -2156,6 +2162,31 @@
+@@ -2156,6 +2164,31 @@
  
  
  
@@ -3705,7 +4659,7 @@
  # 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:
-@@ -2948,8 +2979,7 @@
+@@ -2948,8 +2981,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3715,7 +4669,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3007,8 +3037,7 @@
+@@ -3007,8 +3039,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3725,7 +4679,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3124,8 +3153,7 @@
+@@ -3124,8 +3155,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3735,7 +4689,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3179,8 +3207,7 @@
+@@ -3179,8 +3209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3745,7 +4699,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3225,8 +3252,7 @@
+@@ -3225,8 +3254,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3755,7 +4709,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3270,8 +3296,7 @@
+@@ -3270,8 +3298,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3765,7 +4719,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3828,8 +3853,7 @@
+@@ -3828,8 +3855,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3775,7 +4729,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3887,8 +3911,7 @@
+@@ -3887,8 +3913,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3785,7 +4739,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3959,8 +3982,7 @@
+@@ -3959,8 +3984,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3795,7 +4749,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4004,8 +4026,7 @@
+@@ -4004,8 +4028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3805,7 +4759,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4183,8 +4204,7 @@
+@@ -4183,8 +4206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3815,7 +4769,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4295,8 +4315,7 @@
+@@ -4295,8 +4317,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3825,7 +4779,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4384,8 +4403,7 @@
+@@ -4384,8 +4405,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3835,7 +4789,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4487,8 +4505,7 @@
+@@ -4487,8 +4507,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3845,7 +4799,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4587,8 +4604,7 @@
+@@ -4587,8 +4606,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3855,7 +4809,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4672,8 +4688,7 @@
+@@ -4672,8 +4690,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3865,7 +4819,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4762,8 +4777,7 @@
+@@ -4762,8 +4779,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3875,7 +4829,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4850,8 +4864,7 @@
+@@ -4850,8 +4866,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3885,7 +4839,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4938,8 +4951,7 @@
+@@ -4938,8 +4953,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3895,7 +4849,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5045,8 +5057,7 @@
+@@ -5046,8 +5060,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3905,7 +4859,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5133,8 +5144,7 @@
+@@ -5140,8 +5153,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3915,7 +4869,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5221,8 +5231,7 @@
+@@ -5228,8 +5240,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3925,7 +4879,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5309,8 +5318,7 @@
+@@ -5316,8 +5327,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3935,7 +4889,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5441,8 +5449,7 @@
+@@ -5404,8 +5414,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3945,17 +4899,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5530,8 +5537,7 @@
+@@ -5520,8 +5529,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5613,8 +5621,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5618,8 +5624,7 @@
+@@ -5702,8 +5709,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3965,7 +4929,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5706,8 +5711,7 @@
+@@ -5790,8 +5796,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3975,7 +4939,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5794,8 +5798,7 @@
+@@ -5878,8 +5883,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3985,7 +4949,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5882,8 +5885,7 @@
+@@ -5966,8 +5970,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3995,7 +4959,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6306,8 +6308,7 @@
+@@ -6054,8 +6057,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4005,7 +4969,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6433,8 +6434,7 @@
+@@ -6478,8 +6480,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4015,7 +4979,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6522,8 +6522,7 @@
+@@ -6605,8 +6606,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4025,7 +4989,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6606,185 +6605,6 @@
+@@ -6694,8 +6694,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6778,185 +6777,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -4211,7 +5185,7 @@
    fi
  
  
-@@ -6961,7 +6781,7 @@
+@@ -7144,7 +6964,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4220,7 +5194,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7066,7 +6886,7 @@
+@@ -7249,7 +7069,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,
@@ -4229,7 +5203,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7100,7 +6920,7 @@
+@@ -7283,7 +7103,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -4238,14 +5212,14 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7130,6 +6950,15 @@
+@@ -7313,6 +7133,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='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
@@ -4254,7 +5228,75 @@
  
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7216,44 +7045,36 @@
+@@ -7323,36 +7152,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+@@ -7399,44 +7235,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -4298,7 +5340,7 @@
    ;;
  
 -freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
@@ -4309,7 +5351,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7269,7 +7090,7 @@
+@@ -7452,7 +7280,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -4318,9 +5360,15 @@
    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
-@@ -7286,42 +7107,21 @@
+@@ -7468,43 +7296,27 @@
+   esac
    ;;
  
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++  ;;
++
  irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -  irix5* | nonstopux*)
@@ -4348,7 +5396,7 @@
    ;;
  
  # This must be Linux ELF.
- linux*)
+-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 ;;
@@ -4360,15 +5408,16 @@
 -    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 | knetbsd*-gnu)
++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
-@@ -7340,19 +7140,14 @@
+@@ -7523,32 +7335,22 @@
    ;;
  
  openbsd*)
@@ -4387,27 +5436,58 @@
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
 -  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7362,7 +7157,6 @@
- 
  solaris*)
    lt_cv_deplibs_check_method=pass_all
 -  lt_cv_file_magic_test_file=/lib/libc.so
    ;;
  
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7439,7 +7233,7 @@
+-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]'
+@@ -7569,10 +7371,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
+@@ -7588,6 +7393,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
+ 
+@@ -7622,7 +7430,7 @@
+   ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7442 "configure"' > conftest.$ac_ext
-+  echo '#line 7236 "configure"' > conftest.$ac_ext
+-  echo '#line 7625 "configure"' > conftest.$ac_ext
++  echo '#line 7433 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7482,14 +7276,13 @@
+@@ -7665,14 +7473,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -4424,7 +5504,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7501,7 +7294,6 @@
+@@ -7684,7 +7491,6 @@
        esac
        ;;
      *64-bit*)
@@ -4432,7 +5512,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7561,8 +7353,7 @@
+@@ -7744,8 +7550,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4442,7 +5522,34 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7637,8 +7428,7 @@
+@@ -7780,6 +7585,26 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ 
+ esac
+ 
+@@ -7820,8 +7645,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4452,7 +5559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7808,8 +7598,7 @@
+@@ -7991,8 +7815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4462,7 +5569,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7876,8 +7665,7 @@
+@@ -8059,8 +7882,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4472,7 +5579,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7992,6 +7780,243 @@
+@@ -8175,6 +7997,243 @@
  
  done
  
@@ -4716,16 +5823,16 @@
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8084,7 +8109,7 @@
+@@ -8267,7 +8326,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:8087:" \
-+echo "$as_me:8112:" \
+-echo "$as_me:8270:" \
++echo "$as_me:8329:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8130,8 +8155,7 @@
+@@ -8313,8 +8372,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4735,7 +5842,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8180,8 +8204,7 @@
+@@ -8363,8 +8421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4745,7 +5852,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8239,7 +8262,7 @@
+@@ -8422,7 +8479,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -4754,7 +5861,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8268,20 +8291,53 @@
+@@ -8451,20 +8508,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -4778,6 +5885,12 @@
 +    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
@@ -4791,6 +5904,17 @@
 +      esac
 +    fi
 +    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
 +  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
@@ -4814,7 +5938,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -8318,9 +8374,6 @@
+@@ -8501,9 +8608,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -4824,11 +5948,11 @@
  # 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'"
  
-@@ -8342,6 +8395,13 @@
+@@ -8525,14 +8629,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*)
++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'"
@@ -4838,16 +5962,26 @@
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-@@ -8349,7 +8409,7 @@
+ osf*)
    symcode='[BCDEGQRST]'
    ;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
 -  symcode='[BDT]'
++solaris*)
 +  symcode='[BDRT]'
++  ;;
++sco3.2v5*)
++  symcode='[DT]'
++  ;;
++sysv4.2uw2*)
++  symcode='[DT]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[ABDT]'
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8367,14 +8427,17 @@
+@@ -8550,14 +8670,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -4867,7 +6001,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8536,7 +8599,7 @@
+@@ -8719,7 +8842,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -4876,7 +6010,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8556,7 +8619,7 @@
+@@ -8739,7 +8862,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -4885,7 +6019,26 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8841,6 +8904,17 @@
+@@ -8996,6 +9119,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"
+@@ -9015,15 +9139,26 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -4903,7 +6056,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -8866,7 +8940,7 @@
+@@ -9049,7 +9184,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4912,7 +6065,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -8928,7 +9002,7 @@
+@@ -9111,7 +9246,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4921,46 +6074,91 @@
  	  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
-@@ -9027,6 +9101,20 @@
+@@ -9206,68 +9341,25 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
  compiler=$CC
  
  
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    lt_prog_cc_shlib='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
+-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_static_works=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-     else
+-       lt_prog_compiler_static_works=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static=
+-fi
+-
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -9063,11 +9151,16 @@
-    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
-+     # 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 > conftest.exp
-+       $SED '/^$/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
-@@ -9113,18 +9206,20 @@
+ 
+ 
+ ## CAVEAT EMPTOR:
+@@ -9296,18 +9388,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -4968,25 +6166,37 @@
 +   -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:9119: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9212: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9394: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9123: \$? = $ac_status" >&5
-+   echo "$as_me:9216: \$? = $ac_status" >&5
+-   echo "$as_me:9306: \$? = $ac_status" >&5
++   echo "$as_me:9398: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -9201,7 +9296,7 @@
+@@ -9368,6 +9462,11 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -9384,7 +9483,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -4995,7 +6205,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9227,6 +9322,16 @@
+@@ -9410,6 +9509,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -5012,7 +6222,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9238,7 +9343,7 @@
+@@ -9421,7 +9530,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.
@@ -5021,11 +6231,13 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9262,12 +9367,19 @@
+@@ -9444,13 +9553,20 @@
+       lt_prog_compiler_static='-Bstatic'
        ;;
  
-     linux*)
+-    linux*)
 -      case $CC in
++    linux* | k*bsd*-gnu)
 +      case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl='-Wl,'
@@ -5042,9 +6254,15 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9288,9 +9400,14 @@
+@@ -9465,15 +9581,15 @@
+       lt_prog_compiler_static='-non_shared'
        ;;
  
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
+-      ;;
+-
      solaris*)
 -      lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
@@ -5058,10 +6276,25 @@
        ;;
  
      sunos4*)
-@@ -9312,6 +9429,11 @@
+@@ -9482,7 +9598,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'
+@@ -9495,6 +9611,17 @@
        fi
        ;;
  
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
 +    unicos*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_can_build_shared=no
@@ -5070,7 +6303,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9346,18 +9468,20 @@
+@@ -9529,18 +9656,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5078,25 +6311,25 @@
 +   -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:9352: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9535: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9356: \$? = $ac_status" >&5
-+   echo "$as_me:9478: \$? = $ac_status" >&5
+-   echo "$as_me:9539: \$? = $ac_status" >&5
++   echo "$as_me:9666: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -9378,7 +9502,7 @@
+@@ -9561,7 +9690,7 @@
  fi
  
  fi
@@ -5105,7 +6338,56 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9400,38 +9524,36 @@
+@@ -9571,6 +9700,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works=yes
++       fi
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+@@ -9583,38 +9754,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -5126,21 +6408,21 @@
 +   -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:9419: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9766: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9423: \$? = $ac_status" >&5
-+   echo "$as_me:9540: \$? = $ac_status" >&5
+-   echo "$as_me:9606: \$? = $ac_status" >&5
++   echo "$as_me:9770: \$? = $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 > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -5156,7 +6438,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9502,6 +9624,16 @@
+@@ -9685,6 +9854,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -5173,7 +6455,18 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9522,6 +9654,27 @@
+@@ -9695,6 +9874,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
+     ;;
+@@ -9705,6 +9888,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -5201,7 +6494,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9559,7 +9712,7 @@
+@@ -9742,7 +9946,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -5210,7 +6503,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9569,13 +9722,13 @@
+@@ -9752,13 +9956,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'
@@ -5223,22 +6516,37 @@
  
        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}--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
-@@ -9584,19 +9737,51 @@
+@@ -9767,23 +9971,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--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
 +      ;;
 +
-+    linux*)
++    interix3*)
++      hardcode_direct=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -5271,7 +6579,7 @@
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
@@ -5283,7 +6591,12 @@
        fi
        ;;
  
-@@ -9614,8 +9799,8 @@
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs=no
+ 	cat <<EOF 1>&2
+@@ -9797,13 +10048,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5294,8 +6607,40 @@
        else
  	ld_shlibs=no
        fi
-@@ -9630,24 +9815,19 @@
+       ;;
  
++    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=
+@@ -9813,24 +10091,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'
@@ -5326,7 +6671,16 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9681,9 +9861,20 @@
+@@ -9842,7 +10115,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
+@@ -9864,9 +10137,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
@@ -5342,6 +6696,7 @@
 +  	    break
 +  	  fi
 +	  done
++	  ;;
 +	esac
  
 -	# KDE requires run time linking.  Make it the default.
@@ -5349,7 +6704,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9700,7 +9891,7 @@
+@@ -9883,7 +10168,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -5358,8 +6713,11 @@
  	# 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`
-@@ -9721,6 +9912,9 @@
+@@ -9902,8 +10187,12 @@
+   	  hardcode_libdir_flag_spec='-L$libdir'
+   	  hardcode_libdir_separator=
  	  fi
++	  ;;
  	esac
  	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
@@ -5368,16 +6726,19 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9729,21 +9923,22 @@
+@@ -9911,22 +10200,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
-   	if test "$aix_use_runtimelinking" = yes; then
+-  	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
        fi
  
@@ -5396,7 +6757,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9767,8 +9962,7 @@
+@@ -9950,8 +10240,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5406,7 +6767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9795,14 +9989,13 @@
+@@ -9978,14 +10267,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -5414,17 +6775,17 @@
 -	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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++	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 $compiler_flags ${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
-@@ -9829,8 +10022,7 @@
+@@ -10012,8 +10300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5434,18 +6795,24 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9867,8 +10059,8 @@
+@@ -10045,13 +10332,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=' '
++	  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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  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
        ;;
-@@ -9881,7 +10073,7 @@
+@@ -10064,7 +10349,7 @@
        ld_shlibs=no
        ;;
  
@@ -5454,7 +6821,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -9891,13 +10083,13 @@
+@@ -10074,13 +10359,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -5471,7 +6838,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -9907,52 +10099,52 @@
+@@ -10090,52 +10375,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -5564,18 +6931,18 @@
      fi
        ;;
  
-@@ -9986,8 +10178,8 @@
+@@ -10169,8 +10454,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* | kfreebsd*-gnu | dragonfly*)
++    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
-@@ -9995,7 +10187,7 @@
+@@ -10178,7 +10463,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5584,15 +6951,41 @@
        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
-@@ -10011,16 +10203,16 @@
+@@ -10192,47 +10477,62 @@
+       export_dynamic_flag_spec='${wl}-E'
+       ;;
  
-     hpux10* | hpux11*)
+-    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*|ia64*)
--	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	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'
@@ -5601,21 +6994,52 @@
  	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*|ia64*)
- 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	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'
  	  ;;
-@@ -10030,7 +10222,7 @@
+ 	*)
+-	  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*)
- 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10063,7 +10255,7 @@
+-	  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'
  
+@@ -10246,7 +10546,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'
@@ -5623,16 +7047,16 @@
        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'
-@@ -10073,7 +10265,7 @@
+@@ -10256,7 +10556,7 @@
        link_all_deplibs=yes
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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
-@@ -10096,7 +10288,8 @@
+@@ -10279,7 +10579,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5642,7 +7066,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10106,7 +10299,7 @@
+@@ -10289,7 +10590,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -5651,7 +7075,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10117,14 +10310,14 @@
+@@ -10300,14 +10601,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -5668,7 +7092,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10136,13 +10329,13 @@
+@@ -10319,13 +10620,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5684,7 +7108,18 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10161,10 +10354,12 @@
+@@ -10333,21 +10634,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
@@ -5699,7 +7134,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10173,8 +10368,18 @@
+@@ -10356,8 +10651,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5720,7 +7155,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10183,7 +10388,7 @@
+@@ -10366,7 +10671,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.
@@ -5729,19 +7164,94 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10243,9 +10448,9 @@
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-       no_undefined_flag='${wl}-z ${wl}text'
+@@ -10414,36 +10719,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag='${wl}-z,text'
++      archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
 -	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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 ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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'
-       hardcode_shlibpath_var=no
-@@ -10351,7 +10556,7 @@
++
++      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*)
+@@ -10462,11 +10776,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6
+ test "$ld_shlibs" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -10499,6 +10808,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -10534,7 +10844,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5750,7 +7260,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10361,7 +10566,20 @@
+@@ -10544,7 +10854,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5772,7 +7282,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10426,7 +10644,7 @@
+@@ -10609,7 +10932,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5781,7 +7291,7 @@
    ;;
  
  beos*)
-@@ -10435,7 +10653,7 @@
+@@ -10618,7 +10941,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -5790,7 +7300,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10451,7 +10669,7 @@
+@@ -10634,7 +10957,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5799,7 +7309,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10463,7 +10681,8 @@
+@@ -10646,7 +10969,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -5809,7 +7319,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10493,7 +10712,7 @@
+@@ -10676,7 +11000,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5818,7 +7328,7 @@
        ;;
      esac
      ;;
-@@ -10516,7 +10735,7 @@
+@@ -10699,7 +11023,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5827,19 +7337,22 @@
    # 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"`
-@@ -10539,7 +10758,7 @@
+@@ -10722,20 +11046,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -10551,8 +10770,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -5856,7 +7369,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10570,7 +10798,7 @@
+@@ -10753,14 +11074,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -5865,7 +7378,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10597,9 +10825,9 @@
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -10780,9 +11106,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -5877,7 +7403,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10614,7 +10842,7 @@
+@@ -10797,7 +11123,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5886,7 +7412,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10625,7 +10853,7 @@
+@@ -10808,7 +11134,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5895,7 +7421,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10687,22 +10915,19 @@
+@@ -10820,6 +11146,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -10863,29 +11201,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'
@@ -5924,7 +7477,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10712,6 +10937,30 @@
+@@ -10895,6 +11230,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5940,22 +7493,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10721,7 +10970,7 @@
+@@ -10904,7 +11251,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5964,9 +7505,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10750,7 +10999,11 @@
+@@ -10932,8 +11279,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.
@@ -5977,7 +7520,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -10770,7 +11023,7 @@
+@@ -10953,7 +11305,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5986,7 +7529,69 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10872,8 +11125,8 @@
+@@ -10971,13 +11323,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -11003,7 +11348,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'
+@@ -11036,6 +11381,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}'
+@@ -11051,12 +11419,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
@@ -5997,7 +7602,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -10999,8 +11252,7 @@
+@@ -11182,8 +11555,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6007,7 +7612,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11103,8 +11355,7 @@
+@@ -11286,8 +11658,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6017,7 +7622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11169,8 +11420,7 @@
+@@ -11352,8 +11723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6027,7 +7632,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11263,8 +11513,7 @@
+@@ -11446,8 +11816,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6037,7 +7642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11329,8 +11578,7 @@
+@@ -11512,8 +11881,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6047,7 +7652,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11396,8 +11644,7 @@
+@@ -11579,8 +11947,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6057,7 +7662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11463,8 +11710,7 @@
+@@ -11646,8 +12013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6067,16 +7672,34 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11539,7 +11785,7 @@
+@@ -11706,7 +12072,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"
+@@ -11722,7 +12088,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11542 "configure"
-+#line 11788 "configure"
+-#line 11725 "configure"
++#line 12091 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11605,7 +11851,7 @@
+@@ -11779,6 +12145,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }
+@@ -11788,12 +12156,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6085,16 +7708,40 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11637,7 +11883,7 @@
+       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
+@@ -11808,7 +12176,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+@@ -11820,7 +12188,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11640 "configure"
-+#line 11886 "configure"
+-#line 11823 "configure"
++#line 12191 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11703,7 +11949,7 @@
+@@ -11877,6 +12245,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }
+@@ -11886,12 +12256,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6103,8 +7750,23 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11753,7 +11999,7 @@
+       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
+@@ -11924,7 +12294,7 @@
+ fi
  
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+@@ -11936,7 +12306,7 @@
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -6112,7 +7774,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11762,47 +12008,10 @@
+@@ -11945,47 +12315,10 @@
    fi
    ;;
  
@@ -6161,17 +7823,17 @@
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11828,7 +12037,8 @@
+@@ -12011,7 +12344,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 NM \
++  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 \
-@@ -11942,11 +12152,11 @@
+@@ -12125,11 +12459,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -6185,7 +7847,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -11976,6 +12186,12 @@
+@@ -12159,6 +12493,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -6198,7 +7860,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12006,7 +12222,7 @@
+@@ -12170,6 +12510,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+ 
+@@ -12189,7 +12532,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -6207,7 +7879,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12037,7 +12253,7 @@
+@@ -12220,7 +12563,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -6216,7 +7888,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12052,7 +12268,7 @@
+@@ -12235,7 +12578,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -6225,7 +7897,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12279,7 +12495,10 @@
+@@ -12462,7 +12805,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.
@@ -6237,8 +7909,18 @@
  fi
  
  
-@@ -12344,7 +12563,9 @@
+@@ -12497,6 +12843,9 @@
+ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
  
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -12527,7 +12876,9 @@
+ 
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -6248,7 +7930,15 @@
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12381,7 +12602,7 @@
+@@ -12547,6 +12898,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=
+@@ -12564,7 +12916,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -6257,20 +7947,35 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12402,6 +12623,20 @@
+@@ -12574,17 +12926,34 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
  compiler=$CC
  
  
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
@@ -6278,7 +7983,20 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12423,7 +12658,16 @@
+@@ -12595,18 +12964,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
@@ -6296,7 +8014,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12494,7 +12738,7 @@
+@@ -12677,7 +13055,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,
@@ -6305,7 +8023,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12528,7 +12772,7 @@
+@@ -12711,7 +13089,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -6314,7 +8032,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12547,8 +12791,8 @@
+@@ -12730,8 +13108,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
@@ -6325,7 +8043,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12574,7 +12818,7 @@
+@@ -12757,7 +13135,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.
@@ -6334,7 +8052,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12605,8 +12849,22 @@
+@@ -12788,8 +13166,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -6354,12 +8072,13 @@
 +	    ;;
 +	  esac
 +	done
++	;;
 +      esac
 +
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12623,7 +12881,7 @@
+@@ -12806,7 +13199,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -6368,8 +8087,11 @@
        # 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`
-@@ -12644,6 +12902,9 @@
+@@ -12825,8 +13218,12 @@
+ 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+ 	  hardcode_libdir_separator_CXX=
  	fi
++	;;
        esac
        shared_flag='-shared'
 +      if test "$aix_use_runtimelinking" = yes; then
@@ -6378,7 +8100,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12652,15 +12913,16 @@
+@@ -12835,15 +13232,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -6399,7 +8121,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12690,8 +12952,7 @@
+@@ -12873,8 +13271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6409,23 +8131,23 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12720,13 +12981,12 @@
+@@ -12903,13 +13300,12 @@
  
        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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${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
-@@ -12753,8 +13013,7 @@
+@@ -12936,8 +13332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6435,23 +8157,39 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12791,8 +13050,8 @@
+@@ -12969,16 +13364,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=' '
++	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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	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
      ;;
-@@ -12805,16 +13064,17 @@
-     esac
-     ;;
- 
 +
-   cygwin* | mingw* | pw32*)
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag_CXX=unsupported
++      # Joseph Beckenbach <jrb3 at 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
+       *)
+@@ -12992,12 +13397,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'
@@ -6462,16 +8200,16 @@
  
      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}--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
-@@ -12823,70 +13083,81 @@
+@@ -13006,70 +13411,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}--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
@@ -6600,7 +8338,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -12897,14 +13168,14 @@
+@@ -13080,14 +13496,14 @@
  	;;
      esac
      ;;
@@ -6613,11 +8351,11 @@
      archive_cmds_need_lc_CXX=no
      ;;
 -  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12921,12 +13192,12 @@
+@@ -13104,12 +13520,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -6633,7 +8371,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -12935,11 +13206,11 @@
+@@ -13118,11 +13534,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.
@@ -6647,25 +8385,48 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -12949,7 +13220,7 @@
+@@ -13132,33 +13548,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
 -      case "$host_cpu" in
+-      hppa*64*)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_CXX=:
++
 +      case $host_cpu in
-       hppa*64*)
- 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++      hppa*64*|ia64*)
  	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12965,7 +13236,7 @@
+-	hardcode_libdir_separator_CXX=:
+-        ;;
+-      ia64*)
+-	hardcode_libdir_flag_spec_CXX='-L$libdir'
          ;;
+       *)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_CXX=:
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
        esac
      fi
 -    case "$host_cpu" in
+-    hppa*64*)
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
+-      ;;
+-    ia64*)
 +    case $host_cpu in
-     hppa*64*)
++    hppa*64*|ia64*)
        hardcode_direct_CXX=no
        hardcode_shlibpath_var_CXX=no
-@@ -12986,17 +13257,17 @@
+-      hardcode_minus_L_CXX=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       hardcode_direct_CXX=yes
+@@ -13169,17 +13574,20 @@
      esac
  
      case $cc_basename in
@@ -6676,10 +8437,15 @@
  	;;
 -      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*|ia64*)
- 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	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'
@@ -6687,14 +8453,19 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13012,12 +13283,12 @@
+@@ -13195,12 +13603,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
- 	    ia64*|hppa*64*)
- 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    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'
@@ -6702,8 +8473,24 @@
  	      ;;
  	    esac
  	  fi
-@@ -13030,9 +13301,9 @@
+@@ -13211,11 +13622,25 @@
+ 	;;
+     esac
      ;;
++  interix3*)
++    hardcode_direct_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
    irix5* | irix6*)
      case $cc_basename in
 -      CC)
@@ -6714,7 +8501,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13043,9 +13314,9 @@
+@@ -13226,9 +13651,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -6726,9 +8513,12 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13056,14 +13327,14 @@
+@@ -13237,16 +13662,16 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
      ;;
-   linux*)
+-  linux*)
++  linux* | k*bsd*-gnu)
      case $cc_basename in
 -      KCC)
 +      KCC*)
@@ -6744,7 +8534,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13081,20 +13352,44 @@
+@@ -13264,20 +13689,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -6795,7 +8585,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13122,7 +13417,7 @@
+@@ -13305,7 +13754,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -6804,16 +8594,16 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13132,7 +13427,7 @@
+@@ -13315,7 +13764,7 @@
  	;;
      esac
      ;;
 -  netbsd*)
-+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++  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=
-@@ -13143,15 +13438,31 @@
+@@ -13326,15 +13775,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -6847,7 +8637,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13161,14 +13472,14 @@
+@@ -13344,14 +13809,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -6865,7 +8655,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13186,7 +13497,7 @@
+@@ -13369,7 +13834,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6874,7 +8664,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13205,13 +13516,13 @@
+@@ -13388,13 +13853,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -6890,7 +8680,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13220,17 +13531,17 @@
+@@ -13403,17 +13868,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -6912,7 +8702,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13249,7 +13560,7 @@
+@@ -13432,7 +13897,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6921,17 +8711,23 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13273,7 +13584,7 @@
-   sco*)
-     archive_cmds_need_lc_CXX=no
-     case $cc_basename in
+@@ -13453,27 +13918,14 @@
+     # FIXME: insert proper C++ library support
+     ld_shlibs_CXX=no
+     ;;
+-  sco*)
+-    archive_cmds_need_lc_CXX=no
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13285,12 +13596,12 @@
-     ;;
+-	# 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)
@@ -6945,7 +8741,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13303,36 +13614,33 @@
+@@ -13486,36 +13938,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -6994,7 +8790,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13340,9 +13648,9 @@
+@@ -13523,9 +13972,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -7006,7 +8802,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13352,9 +13660,9 @@
+@@ -13535,9 +13984,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
@@ -7018,7 +8814,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13363,9 +13671,9 @@
+@@ -13546,9 +13995,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -7030,8 +8826,65 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13383,7 +13691,7 @@
+@@ -13561,12 +14010,63 @@
+ 	;;
+     esac
      ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++    no_undefined_flag_CXX='${wl}-z,text'
+     archive_cmds_need_lc_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    no_undefined_flag_CXX='${wl}-z,text'
++    allow_undefined_flag_CXX='${wl}-z,nodefs'
++    archive_cmds_need_lc_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++    export_dynamic_flag_spec_CXX='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
    tandem*)
      case $cc_basename in
 -      NCC)
@@ -7039,7 +8892,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13440,7 +13748,7 @@
+@@ -13623,7 +14123,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.
@@ -7048,7 +8901,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13480,7 +13788,7 @@
+@@ -13663,7 +14163,7 @@
         fi
         ;;
  
@@ -7057,12 +8910,20 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13516,6 +13824,20 @@
+@@ -13699,6 +14199,29 @@
  
  $rm -f confest.$objext
  
 +# PORTME: override above test on systems where it is broken
 +case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  predep_objects_CXX=
++  postdep_objects_CXX=
++  postdeps_CXX=
++  ;;
++
 +solaris*)
 +  case $cc_basename in
 +  CC*)
@@ -7072,13 +8933,25 @@
 +    postdeps_CXX='-lCstd -lCrun'
 +    ;;
 +  esac
++  ;;
 +esac
 +
 +
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13571,7 +13893,7 @@
+@@ -13746,6 +14269,10 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	lt_prog_compiler_pic_CXX=-Kconform_pic
+@@ -13754,7 +14281,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -7087,7 +8960,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13596,18 +13918,28 @@
+@@ -13779,18 +14306,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -7119,12 +8992,12 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13615,22 +13947,22 @@
+@@ -13798,22 +14335,22 @@
  	    ;;
  	esac
  	;;
 -      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
@@ -7132,7 +9005,8 @@
 -	  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="${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
@@ -7140,14 +9014,21 @@
 -	  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"
+-	    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
  	      ;;
-@@ -13645,7 +13977,7 @@
+@@ -13826,9 +14363,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)
@@ -7155,9 +9036,12 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13656,18 +13988,24 @@
+@@ -13837,20 +14378,26 @@
+ 	    ;;
+ 	esac
  	;;
-       linux*)
+-      linux*)
++      linux* | k*bsd*-gnu)
  	case $cc_basename in
 -	  KCC)
 +	  KCC*)
@@ -7183,7 +9067,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13684,25 +14022,25 @@
+@@ -13867,25 +14414,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -7196,7 +9080,7 @@
  	esac
  	;;
 -      netbsd*)
-+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      netbsd* | netbsdelf*-gnu)
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
@@ -7214,17 +9098,19 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13718,7 +14056,7 @@
+@@ -13899,24 +14446,15 @@
  	;;
-       sco*)
- 	case $cc_basename in
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  *)
-@@ -13727,13 +14065,13 @@
- 	;;
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
        solaris*)
  	case $cc_basename in
 -	  CC)
@@ -7239,7 +9125,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13743,12 +14081,12 @@
+@@ -13926,12 +14464,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -7254,7 +9140,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13758,7 +14096,7 @@
+@@ -13941,7 +14479,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -7263,7 +9149,23 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13799,18 +14137,20 @@
+@@ -13949,7 +14487,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*)
+ 	;;
+@@ -13982,18 +14527,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -7271,25 +9173,25 @@
 +   -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:13805: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14143: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13988: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14533: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13809: \$? = $ac_status" >&5
-+   echo "$as_me:14147: \$? = $ac_status" >&5
+-   echo "$as_me:13992: \$? = $ac_status" >&5
++   echo "$as_me:14537: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -13831,7 +14171,7 @@
+@@ -14014,7 +14561,7 @@
  fi
  
  fi
@@ -7298,10 +9200,29 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -13853,38 +14193,36 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+@@ -14024,50 +14571,90 @@
+     ;;
+ esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_cv_prog_compiler_c_o_CXX=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
 -   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
 -   # that will create temporary files in the current directory regardless of
 -   # the output directory.  Thus, making CWD read-only will cause this test
@@ -7309,6 +9230,51 @@
 -   # builds.
 -   chmod -w .
 -
++  lt_prog_compiler_static_works_CXX=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_CXX=yes
++       fi
++     else
++       lt_prog_compiler_static_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++
++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++    :
++else
++    lt_prog_compiler_static_CXX=
++fi
++
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
@@ -7319,21 +9285,21 @@
 +   -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:13872: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14055: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14637: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13876: \$? = $ac_status" >&5
-+   echo "$as_me:14209: \$? = $ac_status" >&5
+-   echo "$as_me:14059: \$? = $ac_status" >&5
++   echo "$as_me:14641: \$? = $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 > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -7349,19 +9315,39 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -13934,7 +14272,10 @@
+@@ -14117,7 +14704,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
 -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
-+  linux*)
++  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'
-@@ -14017,7 +14358,7 @@
+@@ -14128,11 +14718,6 @@
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -14165,6 +14750,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_CXX
++	pic_flag=$lt_prog_compiler_pic_CXX
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -14200,7 +14786,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -7370,7 +9356,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14027,7 +14368,20 @@
+@@ -14210,7 +14796,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7392,7 +9378,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14092,7 +14446,7 @@
+@@ -14275,7 +14874,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7401,7 +9387,7 @@
    ;;
  
  beos*)
-@@ -14101,7 +14455,7 @@
+@@ -14284,7 +14883,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -7410,7 +9396,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14117,7 +14471,7 @@
+@@ -14300,7 +14899,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -7419,7 +9405,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14129,7 +14483,8 @@
+@@ -14312,7 +14911,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -7429,7 +9415,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14159,7 +14514,7 @@
+@@ -14342,7 +14942,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7438,7 +9424,7 @@
        ;;
      esac
      ;;
-@@ -14182,7 +14537,7 @@
+@@ -14365,7 +14965,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -7447,19 +9433,22 @@
    # 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"`
-@@ -14205,7 +14560,7 @@
+@@ -14388,20 +14988,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -14217,8 +14572,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -7476,7 +9465,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14236,7 +14600,7 @@
+@@ -14419,14 +15016,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -7485,7 +9474,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14263,9 +14627,9 @@
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -14446,9 +15048,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -7497,7 +9499,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14280,7 +14644,7 @@
+@@ -14463,7 +15065,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -7506,7 +9508,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14291,7 +14655,7 @@
+@@ -14474,7 +15076,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -7515,7 +9517,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14353,22 +14717,19 @@
+@@ -14486,6 +15088,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -14529,29 +15143,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'
@@ -7544,7 +9573,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14378,6 +14739,30 @@
+@@ -14561,6 +15172,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -7560,22 +9589,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14387,7 +14772,7 @@
+@@ -14570,7 +15193,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -7584,9 +9601,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14416,7 +14801,11 @@
+@@ -14598,8 +15221,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.
@@ -7597,7 +9616,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14436,7 +14825,7 @@
+@@ -14619,7 +15247,7 @@
  
  os2*)
    libname_spec='$name'
@@ -7606,7 +9625,69 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14538,8 +14927,8 @@
+@@ -14637,13 +15265,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -14669,7 +15290,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'
+@@ -14702,6 +15323,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}'
+@@ -14717,12 +15361,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7617,163 +9698,1349 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14665,8 +15054,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+@@ -14754,1118 +15403,293 @@
+   enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
+ 
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+     ;;
++  esac
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++cfgfile="$ofile"
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14769,8 +15157,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
+-fi
++# 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
+ 
+-  *)
+-    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
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-#undef shl_load
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char 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
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-int
+-main ()
+-{
+-return f != shl_load;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14835,8 +15222,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A C compiler.
++LTCC=$lt_LTCC
+ 
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-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.  */
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14929,8 +15315,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+ 
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-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
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+ 
+-#undef dlopen
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char 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
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14995,8 +15380,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A symbol stripping program
++STRIP=$lt_STRIP
+ 
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-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.  */
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -15062,8 +15446,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-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.  */
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -15129,8 +15512,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-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.  */
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -15205,7 +15587,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15208 "configure"
-+#line 15590 "configure"
- #include "confdefs.h"
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_dld_link=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
  
- #if HAVE_DLFCN_H
-@@ -15271,7 +15653,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15303,7 +15685,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15306 "configure"
-+#line 15688 "configure"
- #include "confdefs.h"
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
  
- #if HAVE_DLFCN_H
-@@ -15369,7 +15751,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-fi
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-fi
++# 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
+ 
+-fi
++# 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
+ 
+-fi
++# 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
+ 
+-fi
++# Do we need a version for libraries?
++need_version=$need_version
+ 
+-    ;;
+-  esac
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-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 15391 "configure"
+-#include "confdefs.h"
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+ 
+-#include <stdio.h>
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++# Library versioning type.
++version_type=$version_type
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#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
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-    exit (status);
+-}
+-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
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15420,7 +15802,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 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 \
-@@ -15520,6 +15903,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
+-    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*
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -15550,7 +15939,7 @@
- NM=$lt_NM
++# 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
  
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
  
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -15581,7 +15970,7 @@
- libext="$libext"
+-    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 15489 "configure"
+-#include "confdefs.h"
++# 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
  
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -15596,7 +15985,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-#include <stdio.h>
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_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
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#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
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
+-
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_CXX \
+-    CC_CXX \
+-    LD_CXX \
+-    lt_prog_compiler_wl_CXX \
+-    lt_prog_compiler_pic_CXX \
+-    lt_prog_compiler_static_CXX \
+-    lt_prog_compiler_no_builtin_flag_CXX \
+-    export_dynamic_flag_spec_CXX \
+-    thread_safe_flag_spec_CXX \
+-    whole_archive_flag_spec_CXX \
+-    enable_shared_with_static_runtimes_CXX \
+-    old_archive_cmds_CXX \
+-    old_archive_from_new_cmds_CXX \
+-    predep_objects_CXX \
+-    postdep_objects_CXX \
+-    predeps_CXX \
+-    postdeps_CXX \
+-    compiler_lib_search_path_CXX \
+-    archive_cmds_CXX \
+-    archive_expsym_cmds_CXX \
+-    postinstall_cmds_CXX \
+-    postuninstall_cmds_CXX \
+-    old_archive_from_expsyms_cmds_CXX \
+-    allow_undefined_flag_CXX \
+-    no_undefined_flag_CXX \
+-    export_symbols_cmds_CXX \
+-    hardcode_libdir_flag_spec_CXX \
+-    hardcode_libdir_flag_spec_ld_CXX \
+-    hardcode_libdir_separator_CXX \
+-    hardcode_automatic_CXX \
+-    module_cmds_CXX \
+-    module_expsym_cmds_CXX \
+-    lt_cv_prog_compiler_c_o_CXX \
+-    exclude_expsyms_CXX \
+-    include_expsyms_CXX; do
+-
+-    case $var in
+-    old_archive_cmds_CXX | \
+-    old_archive_from_new_cmds_CXX | \
+-    archive_cmds_CXX | \
+-    archive_expsym_cmds_CXX | \
+-    module_cmds_CXX | \
+-    module_expsym_cmds_CXX | \
+-    old_archive_from_expsyms_cmds_CXX | \
+-    export_symbols_cmds_CXX | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-cfgfile="$ofile"
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
 -# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
+-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
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
  
- # Do we need the lib prefix for modules?
-@@ -15798,7 +16187,10 @@
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -15981,7 +15805,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.
@@ -7785,20 +11052,27 @@
  fi
  
  
-@@ -15874,12 +16266,35 @@
+@@ -16053,16 +15880,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
  compiler=$CC
  
  
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
@@ -7822,7 +11096,7 @@
  
  echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15892,7 +16307,7 @@
+@@ -16075,7 +15928,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -7831,7 +11105,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -15900,8 +16315,10 @@
+@@ -16083,8 +15936,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -7844,7 +11118,28 @@
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15978,7 +16395,7 @@
+@@ -16097,8 +15952,6 @@
+ echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6
+ 
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+-
+ GCC_F77="$G77"
+ LD_F77="$LD"
+ 
+@@ -16145,6 +15998,11 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -16161,7 +16019,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -7853,7 +11148,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16004,6 +16421,16 @@
+@@ -16187,6 +16045,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -7870,7 +11165,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16015,7 +16442,7 @@
+@@ -16198,7 +16066,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.
@@ -7879,11 +11174,13 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16039,12 +16466,19 @@
+@@ -16221,13 +16089,20 @@
+       lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
-     linux*)
+-    linux*)
 -      case $CC in
++    linux* | k*bsd*-gnu)
 +      case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_F77='-Wl,'
@@ -7900,9 +11197,15 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16065,9 +16499,14 @@
+@@ -16242,15 +16117,15 @@
+       lt_prog_compiler_static_F77='-non_shared'
        ;;
  
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
+-      ;;
+-
      solaris*)
 -      lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
@@ -7916,10 +11219,25 @@
        ;;
  
      sunos4*)
-@@ -16089,6 +16528,11 @@
+@@ -16259,7 +16134,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'
+@@ -16272,6 +16147,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
@@ -7928,7 +11246,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16123,18 +16567,20 @@
+@@ -16306,18 +16192,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -7936,25 +11254,25 @@
 +   -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:16129: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16573: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16312: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16133: \$? = $ac_status" >&5
-+   echo "$as_me:16577: \$? = $ac_status" >&5
+-   echo "$as_me:16316: \$? = $ac_status" >&5
++   echo "$as_me:16202: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -16155,7 +16601,7 @@
+@@ -16338,7 +16226,7 @@
  fi
  
  fi
@@ -7963,7 +11281,56 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16177,38 +16623,36 @@
+@@ -16348,6 +16236,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_F77=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_F77=yes
++       fi
++     else
++       lt_prog_compiler_static_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++
++if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++    :
++else
++    lt_prog_compiler_static_F77=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+@@ -16360,38 +16290,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7984,21 +11351,21 @@
 +   -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:16196: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16379: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16200: \$? = $ac_status" >&5
-+   echo "$as_me:16639: \$? = $ac_status" >&5
+-   echo "$as_me:16383: \$? = $ac_status" >&5
++   echo "$as_me:16306: \$? = $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 > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -8014,7 +11381,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16279,6 +16723,16 @@
+@@ -16462,6 +16390,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -8031,7 +11398,18 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16299,6 +16753,27 @@
+@@ -16472,6 +16410,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
+     ;;
+@@ -16482,6 +16424,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -8059,7 +11437,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16336,7 +16811,7 @@
+@@ -16519,7 +16482,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -8068,7 +11446,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16346,13 +16821,13 @@
+@@ -16529,13 +16492,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'
@@ -8081,24 +11459,38 @@
  
        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}--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
-@@ -16361,19 +16836,51 @@
+@@ -16544,23 +16507,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--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
-       ;;
- 
--    netbsd*)
-+    linux*)
++      fi
++      ;;
++
++    interix3*)
++      hardcode_direct_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec_F77='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -8127,10 +11519,11 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       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=
@@ -8142,7 +11535,12 @@
        fi
        ;;
  
-@@ -16391,8 +16898,8 @@
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_F77=no
+ 	cat <<EOF 1>&2
+@@ -16574,13 +16584,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8153,8 +11551,40 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16407,24 +16914,19 @@
+       ;;
  
++    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=
+@@ -16590,24 +16627,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'
@@ -8185,7 +11615,16 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16458,9 +16960,20 @@
+@@ -16619,7 +16651,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
+@@ -16641,9 +16673,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
@@ -8201,6 +11640,7 @@
 +  	    break
 +  	  fi
 +	  done
++	  ;;
 +	esac
  
 -	# KDE requires run time linking.  Make it the default.
@@ -8208,7 +11648,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16477,7 +16990,7 @@
+@@ -16660,7 +16704,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -8217,8 +11657,11 @@
  	# 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`
-@@ -16498,6 +17011,9 @@
+@@ -16679,8 +16723,12 @@
+   	  hardcode_libdir_flag_spec_F77='-L$libdir'
+   	  hardcode_libdir_separator_F77=
  	  fi
++	  ;;
  	esac
  	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
@@ -8227,16 +11670,19 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16506,21 +17022,22 @@
+@@ -16688,22 +16736,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
-   	if test "$aix_use_runtimelinking" = yes; then
+-  	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
        fi
  
@@ -8255,7 +11701,7 @@
        program main
  
        end
-@@ -16534,8 +17051,7 @@
+@@ -16717,8 +16766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8265,7 +11711,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16562,14 +17078,13 @@
+@@ -16745,14 +16793,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -8273,17 +11719,17 @@
 -	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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++	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 $compiler_flags ${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
-@@ -16586,8 +17101,7 @@
+@@ -16769,8 +16816,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8293,18 +11739,24 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16624,8 +17138,8 @@
+@@ -16802,13 +16848,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=' '
++	  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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  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
        ;;
-@@ -16638,7 +17152,7 @@
+@@ -16821,7 +16865,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -8313,7 +11765,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16648,68 +17162,68 @@
+@@ -16831,68 +16875,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -8426,18 +11878,18 @@
      fi
        ;;
  
-@@ -16743,8 +17257,8 @@
+@@ -16926,8 +16970,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* | kfreebsd*-gnu | dragonfly*)
++    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
-@@ -16752,7 +17266,7 @@
+@@ -16935,7 +16979,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8446,15 +11898,41 @@
        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
-@@ -16768,16 +17282,16 @@
+@@ -16949,47 +16993,62 @@
+       export_dynamic_flag_spec_F77='${wl}-E'
+       ;;
  
-     hpux10* | hpux11*)
+-    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*|ia64*)
--	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	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'
@@ -8463,21 +11941,52 @@
  	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*|ia64*)
- 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	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'
  	  ;;
-@@ -16787,7 +17301,7 @@
+ 	*)
+-	  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*)
- 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16820,7 +17334,7 @@
+-	  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'
  
+@@ -17003,7 +17062,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'
@@ -8485,16 +11994,16 @@
        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'
-@@ -16830,7 +17344,7 @@
+@@ -17013,7 +17072,7 @@
        link_all_deplibs_F77=yes
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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
-@@ -16853,7 +17367,8 @@
+@@ -17036,7 +17095,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8504,7 +12013,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16863,7 +17378,7 @@
+@@ -17046,7 +17106,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -8513,7 +12022,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16874,14 +17389,14 @@
+@@ -17057,14 +17117,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -8530,7 +12039,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16893,13 +17408,13 @@
+@@ -17076,13 +17136,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8546,7 +12055,18 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16918,10 +17433,12 @@
+@@ -17090,21 +17150,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
@@ -8561,7 +12081,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16930,8 +17447,18 @@
+@@ -17113,8 +17167,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8582,7 +12102,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -16940,7 +17467,7 @@
+@@ -17123,7 +17187,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.
@@ -8591,19 +12111,94 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17000,9 +17527,9 @@
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-       no_undefined_flag_F77='${wl}-z ${wl}text'
+@@ -17171,36 +17235,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag_F77='${wl}-z,text'
++      archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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 ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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'
-       hardcode_shlibpath_var_F77=no
-@@ -17108,7 +17635,7 @@
++
++      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*)
+@@ -17219,11 +17292,6 @@
+ echo "${ECHO_T}$ld_shlibs_F77" >&6
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -17256,6 +17324,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_F77
++	pic_flag=$lt_prog_compiler_pic_F77
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -17291,7 +17360,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8612,7 +12207,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17118,7 +17645,20 @@
+@@ -17301,7 +17370,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8634,7 +12229,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17183,7 +17723,7 @@
+@@ -17366,7 +17448,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8643,7 +12238,7 @@
    ;;
  
  beos*)
-@@ -17192,7 +17732,7 @@
+@@ -17375,7 +17457,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8652,7 +12247,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17208,7 +17748,7 @@
+@@ -17391,7 +17473,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8661,7 +12256,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17220,7 +17760,8 @@
+@@ -17403,7 +17485,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8671,7 +12266,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17250,7 +17791,7 @@
+@@ -17433,7 +17516,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8680,7 +12275,7 @@
        ;;
      esac
      ;;
-@@ -17273,7 +17814,7 @@
+@@ -17456,7 +17539,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8689,19 +12284,22 @@
    # 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"`
-@@ -17296,7 +17837,7 @@
+@@ -17479,20 +17562,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17308,8 +17849,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -8718,7 +12316,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17327,7 +17877,7 @@
+@@ -17510,14 +17590,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8727,7 +12325,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17354,9 +17904,9 @@
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -17537,9 +17622,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8739,7 +12350,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17371,7 +17921,7 @@
+@@ -17554,7 +17639,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8748,7 +12359,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17382,7 +17932,7 @@
+@@ -17565,7 +17650,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8757,7 +12368,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17444,22 +17994,19 @@
+@@ -17577,6 +17662,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -17620,29 +17717,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'
@@ -8786,7 +12424,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17469,6 +18016,30 @@
+@@ -17652,6 +17746,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8802,22 +12440,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17478,7 +18049,7 @@
+@@ -17661,7 +17767,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8826,9 +12452,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17507,7 +18078,11 @@
+@@ -17689,8 +17795,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.
@@ -8839,7 +12467,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17527,7 +18102,7 @@
+@@ -17710,7 +17821,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8848,7 +12476,69 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17629,8 +18204,8 @@
+@@ -17728,13 +17839,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -17760,7 +17864,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'
+@@ -17793,6 +17897,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}'
+@@ -17808,12 +17935,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8859,17 +12549,54 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17706,7 +18281,8 @@
+@@ -17845,36 +17977,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
+@@ -17889,7 +17991,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 NM \
++  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 \
-@@ -17806,6 +18382,12 @@
+@@ -17989,6 +18092,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -8882,7 +12609,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17836,7 +18418,7 @@
+@@ -18000,6 +18109,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+ 
+@@ -18019,7 +18131,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8891,7 +12628,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17867,7 +18449,7 @@
+@@ -18050,7 +18162,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8900,7 +12637,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -17882,7 +18464,7 @@
+@@ -18065,7 +18177,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -8909,7 +12646,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18084,7 +18666,10 @@
+@@ -18267,7 +18379,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.
@@ -8921,7 +12658,7 @@
  fi
  
  
-@@ -18117,7 +18702,7 @@
+@@ -18300,26 +18415,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -8930,20 +12667,26 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18128,15 +18713,41 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
  compiler=$CC
  
  
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
@@ -8972,7 +12715,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18163,18 +18774,20 @@
+@@ -18346,18 +18490,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8980,25 +12723,37 @@
 +   -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:18169: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18780: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18352: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18496: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18173: \$? = $ac_status" >&5
-+   echo "$as_me:18784: \$? = $ac_status" >&5
+-   echo "$as_me:18356: \$? = $ac_status" >&5
++   echo "$as_me:18500: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -18251,7 +18864,7 @@
+@@ -18418,6 +18564,11 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -18434,7 +18585,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -9007,7 +12762,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18277,6 +18890,16 @@
+@@ -18460,6 +18611,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -9024,7 +12779,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18288,7 +18911,7 @@
+@@ -18471,7 +18632,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.
@@ -9033,11 +12788,13 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18312,12 +18935,19 @@
+@@ -18494,13 +18655,20 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
-     linux*)
+-    linux*)
 -      case $CC in
++    linux* | k*bsd*-gnu)
 +      case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -9054,9 +12811,15 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18338,9 +18968,14 @@
+@@ -18515,15 +18683,15 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_GCJ='-Kpic'
+-      lt_prog_compiler_static_GCJ='-dn'
+-      ;;
+-
      solaris*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
@@ -9070,10 +12833,25 @@
        ;;
  
      sunos4*)
-@@ -18362,6 +18997,11 @@
+@@ -18532,7 +18700,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'
+@@ -18545,6 +18713,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
@@ -9082,7 +12860,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18396,18 +19036,20 @@
+@@ -18579,18 +18758,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -9090,25 +12868,25 @@
 +   -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:18402: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19042: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18585: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18764: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18406: \$? = $ac_status" >&5
-+   echo "$as_me:19046: \$? = $ac_status" >&5
+-   echo "$as_me:18589: \$? = $ac_status" >&5
++   echo "$as_me:18768: \$? = $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 >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $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
-@@ -18428,7 +19070,7 @@
+@@ -18611,7 +18792,7 @@
  fi
  
  fi
@@ -9117,7 +12895,56 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18450,38 +19092,36 @@
+@@ -18621,6 +18802,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_GCJ=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_GCJ=yes
++       fi
++     else
++       lt_prog_compiler_static_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++
++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++    :
++else
++    lt_prog_compiler_static_GCJ=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+@@ -18633,38 +18856,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -9138,21 +12965,21 @@
 +   -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:18469: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19104: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18652: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18868: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18473: \$? = $ac_status" >&5
-+   echo "$as_me:19108: \$? = $ac_status" >&5
+-   echo "$as_me:18656: \$? = $ac_status" >&5
++   echo "$as_me:18872: \$? = $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 > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -9168,7 +12995,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18552,6 +19192,16 @@
+@@ -18735,6 +18956,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -9185,7 +13012,18 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18572,6 +19222,27 @@
+@@ -18745,6 +18976,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
+     ;;
+@@ -18755,6 +18990,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -9213,7 +13051,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18609,7 +19280,7 @@
+@@ -18792,7 +19048,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -9222,7 +13060,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18619,13 +19290,13 @@
+@@ -18802,13 +19058,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'
@@ -9235,24 +13073,38 @@
  
        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}--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
-@@ -18634,19 +19305,51 @@
+@@ -18817,23 +19073,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--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
-       ;;
- 
--    netbsd*)
-+    linux*)
++      fi
++      ;;
++
++    interix3*)
++      hardcode_direct_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -9281,10 +13133,11 @@
 +	link_all_deplibs_GCJ=no
 +      else
 +	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       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=
@@ -9296,7 +13149,12 @@
        fi
        ;;
  
-@@ -18664,8 +19367,8 @@
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_GCJ=no
+ 	cat <<EOF 1>&2
+@@ -18847,13 +19150,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9307,8 +13165,40 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18680,24 +19383,19 @@
+       ;;
  
++    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=
+@@ -18863,24 +19193,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'
@@ -9339,7 +13229,16 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18731,9 +19429,20 @@
+@@ -18892,7 +19217,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
+@@ -18914,9 +19239,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
@@ -9355,6 +13254,7 @@
 +  	    break
 +  	  fi
 +	  done
++	  ;;
 +	esac
  
 -	# KDE requires run time linking.  Make it the default.
@@ -9362,7 +13262,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18750,7 +19459,7 @@
+@@ -18933,7 +19270,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -9371,8 +13271,11 @@
  	# 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`
-@@ -18771,6 +19480,9 @@
+@@ -18952,8 +19289,12 @@
+   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+   	  hardcode_libdir_separator_GCJ=
  	  fi
++	  ;;
  	esac
  	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
@@ -9381,16 +13284,19 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18779,21 +19491,22 @@
+@@ -18961,22 +19302,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
-   	if test "$aix_use_runtimelinking" = yes; then
+-  	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
        fi
  
@@ -9409,7 +13315,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18817,8 +19530,7 @@
+@@ -19000,8 +19342,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9419,7 +13325,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18845,14 +19557,13 @@
+@@ -19028,14 +19369,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -9427,17 +13333,17 @@
 -	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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++	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 $compiler_flags ${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
-@@ -18879,8 +19590,7 @@
+@@ -19062,8 +19402,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9447,18 +13353,24 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18917,8 +19627,8 @@
+@@ -19095,13 +19434,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=' '
++	  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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  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
        ;;
-@@ -18931,7 +19641,7 @@
+@@ -19114,7 +19451,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -9467,7 +13379,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -18941,68 +19651,68 @@
+@@ -19124,68 +19461,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -9580,18 +13492,18 @@
      fi
        ;;
  
-@@ -19036,8 +19746,8 @@
+@@ -19219,8 +19556,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* | kfreebsd*-gnu | dragonfly*)
++    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
-@@ -19045,7 +19755,7 @@
+@@ -19228,7 +19565,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -9600,15 +13512,41 @@
        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
-@@ -19061,16 +19771,16 @@
+@@ -19242,47 +19579,62 @@
+       export_dynamic_flag_spec_GCJ='${wl}-E'
+       ;;
  
-     hpux10* | hpux11*)
+-    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*|ia64*)
--	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	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'
@@ -9617,21 +13555,52 @@
  	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*|ia64*)
- 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	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'
  	  ;;
-@@ -19080,7 +19790,7 @@
+ 	*)
+-	  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*)
- 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19113,7 +19823,7 @@
+-	  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'
  
+@@ -19296,7 +19648,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'
@@ -9639,16 +13608,16 @@
        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'
-@@ -19123,7 +19833,7 @@
+@@ -19306,7 +19658,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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
-@@ -19146,7 +19856,8 @@
+@@ -19329,7 +19681,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -9658,7 +13627,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19156,7 +19867,7 @@
+@@ -19339,7 +19692,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -9667,7 +13636,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19167,14 +19878,14 @@
+@@ -19350,14 +19703,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -9684,7 +13653,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19186,13 +19897,13 @@
+@@ -19369,13 +19722,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9700,7 +13669,18 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19211,10 +19922,12 @@
+@@ -19383,21 +19736,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
@@ -9715,7 +13695,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19223,8 +19936,18 @@
+@@ -19406,8 +19753,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9736,7 +13716,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19233,7 +19956,7 @@
+@@ -19416,7 +19773,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.
@@ -9745,19 +13725,94 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19293,9 +20016,9 @@
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-       no_undefined_flag_GCJ='${wl}-z ${wl}text'
+@@ -19464,36 +19821,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z,text'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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 ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	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'
-       hardcode_shlibpath_var_GCJ=no
-@@ -19401,7 +20124,7 @@
++
++      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*)
+@@ -19512,11 +19878,6 @@
+ echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19549,6 +19910,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_GCJ
++	pic_flag=$lt_prog_compiler_pic_GCJ
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -19584,7 +19946,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -9766,7 +13821,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19411,7 +20134,20 @@
+@@ -19594,7 +19956,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9788,7 +13843,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19476,7 +20212,7 @@
+@@ -19659,7 +20034,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9797,7 +13852,7 @@
    ;;
  
  beos*)
-@@ -19485,7 +20221,7 @@
+@@ -19668,7 +20043,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -9806,7 +13861,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19501,7 +20237,7 @@
+@@ -19684,7 +20059,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9815,7 +13870,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19513,7 +20249,8 @@
+@@ -19696,7 +20071,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -9825,7 +13880,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19543,7 +20280,7 @@
+@@ -19726,7 +20102,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9834,7 +13889,7 @@
        ;;
      esac
      ;;
-@@ -19566,7 +20303,7 @@
+@@ -19749,7 +20125,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9843,19 +13898,22 @@
    # 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"`
-@@ -19589,7 +20326,7 @@
+@@ -19772,20 +20148,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -19601,8 +20338,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -9872,7 +13930,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19620,7 +20366,7 @@
+@@ -19803,14 +20176,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -9881,7 +13939,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19647,9 +20393,9 @@
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -19830,9 +20208,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -9893,7 +13964,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19664,7 +20410,7 @@
+@@ -19847,7 +20225,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9902,7 +13973,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19675,7 +20421,7 @@
+@@ -19858,7 +20236,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9911,7 +13982,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19737,22 +20483,19 @@
+@@ -19870,6 +20248,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -19913,29 +20303,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'
@@ -9940,7 +14038,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -19762,6 +20505,30 @@
+@@ -19945,6 +20332,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9956,22 +14054,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19771,7 +20538,7 @@
+@@ -19954,7 +20353,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -9980,9 +14066,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19800,7 +20567,11 @@
+@@ -19982,995 +20381,186 @@
+ 
  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.
@@ -9993,143 +14081,1159 @@
    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
-@@ -19820,7 +20591,7 @@
- 
- os2*)
-   libname_spec='$name'
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -19922,8 +20693,8 @@
- 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" || \
+-  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
-+   test -n "$runpath_var_GCJ" || \
-+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_GCJ" != no &&
-@@ -20049,8 +20820,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-
+-  # 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 gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20153,8 +20923,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-
+-fi
+-
+-   ;;
+-
+-  *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char 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
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != shl_load;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20219,8 +20988,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20313,8 +21081,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char 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
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20379,8 +21146,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20446,8 +21212,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20513,8 +21278,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20589,7 +21353,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20592 "configure"
-+#line 21356 "configure"
- #include "confdefs.h"
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+-
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20775 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20873 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++  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
++  ;;
  
- #if HAVE_DLFCN_H
-@@ -20655,7 +21419,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-#include <stdio.h>
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  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
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20687,7 +21451,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 20690 "configure"
-+#line 21454 "configure"
- #include "confdefs.h"
+-    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 ;;
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
+     esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+   fi
+-fi
+-rm -fr conftest*
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
  
- #if HAVE_DLFCN_H
-@@ -20753,7 +21517,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20804,7 +21568,8 @@
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
+ 
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
+ fi
+ 
+ 
+@@ -20987,7 +20577,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 NM \
++  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 \
-@@ -20904,6 +21669,12 @@
+@@ -21087,6 +20678,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -10142,7 +15246,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -20934,7 +21705,7 @@
+@@ -21098,6 +20695,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+ 
+@@ -21117,7 +20717,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -10151,7 +15265,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -20965,7 +21736,7 @@
+@@ -21148,7 +20748,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -10160,7 +15274,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -20980,7 +21751,7 @@
+@@ -21163,7 +20763,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -10169,7 +15283,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21182,7 +21953,10 @@
+@@ -21365,7 +20965,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.
@@ -10181,20 +15295,27 @@
  fi
  
  
-@@ -21225,11 +21999,35 @@
+@@ -21404,15 +21007,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
  compiler=$CC
  
  
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
@@ -10217,17 +15338,17 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21245,7 +22043,8 @@
+@@ -21428,7 +21058,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 NM \
++  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 \
-@@ -21345,6 +22144,12 @@
+@@ -21528,6 +21159,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -10240,7 +15361,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21375,7 +22180,7 @@
+@@ -21539,6 +21176,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+ 
+@@ -21558,7 +21198,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -10249,7 +15380,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21406,7 +22211,7 @@
+@@ -21589,7 +21229,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -10258,7 +15389,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21421,7 +22226,7 @@
+@@ -21604,7 +21244,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -10267,7 +15398,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21623,7 +22428,10 @@
+@@ -21806,7 +21446,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.
@@ -10279,7 +15410,7 @@
  fi
  
  
-@@ -21670,7 +22478,7 @@
+@@ -21853,7 +21496,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -10288,7 +15419,7 @@
  
  # Prevent multiple expansion
  
-@@ -22111,8 +22919,7 @@
+@@ -22294,8 +21937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10298,7 +15429,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22209,8 +23016,7 @@
+@@ -22392,8 +22034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10308,7 +15439,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22279,8 +23085,7 @@
+@@ -22462,8 +22103,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10318,7 +15449,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22383,8 +23188,7 @@
+@@ -22566,8 +22206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10328,7 +15459,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22453,8 +23257,7 @@
+@@ -22636,8 +22275,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10338,7 +15469,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22529,8 +23332,7 @@
+@@ -22712,8 +22350,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10348,7 +15479,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22637,8 +23439,7 @@
+@@ -22820,8 +22457,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10358,7 +15489,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22909,8 +23710,7 @@
+@@ -23092,8 +22728,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10368,7 +15499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23060,8 +23860,7 @@
+@@ -23243,8 +22878,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10378,7 +15509,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23246,8 +24045,7 @@
+@@ -23429,8 +23063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10388,7 +15519,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23349,8 +24147,7 @@
+@@ -23532,8 +23165,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10398,7 +15529,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23452,8 +24249,7 @@
+@@ -23635,8 +23267,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10408,7 +15539,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23554,8 +24350,7 @@
+@@ -23737,8 +23368,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10418,7 +15549,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23846,8 +24641,7 @@
+@@ -24029,8 +23659,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10428,7 +15559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23912,8 +24706,7 @@
+@@ -24095,8 +23724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10438,7 +15569,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23977,8 +24770,7 @@
+@@ -24160,8 +23788,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10448,7 +15579,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24059,8 +24851,7 @@
+@@ -24242,8 +23869,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10458,7 +15589,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24201,8 +24992,7 @@
+@@ -24384,8 +24010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10468,7 +15599,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24340,8 +25130,7 @@
+@@ -24523,8 +24148,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10478,7 +15609,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24525,8 +25314,7 @@
+@@ -24708,8 +24332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10488,7 +15619,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24772,8 +25560,7 @@
+@@ -24955,8 +24578,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10498,7 +15629,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24966,8 +25753,7 @@
+@@ -25149,8 +24771,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10508,7 +15639,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25048,8 +25834,7 @@
+@@ -25231,8 +24852,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10518,7 +15649,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25119,8 +25904,7 @@
+@@ -25302,8 +24922,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10528,7 +15659,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25229,8 +26013,7 @@
+@@ -25412,8 +25031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10538,7 +15669,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25322,8 +26105,7 @@
+@@ -25505,8 +25123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10548,7 +15679,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25395,8 +26177,7 @@
+@@ -25578,8 +25195,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10558,7 +15689,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25450,8 +26231,7 @@
+@@ -25633,8 +25249,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10568,7 +15699,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25522,8 +26302,7 @@
+@@ -25705,8 +25320,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10578,7 +15709,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25577,8 +26356,7 @@
+@@ -25760,8 +25374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10588,7 +15719,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25645,8 +26423,7 @@
+@@ -25828,8 +25441,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10598,7 +15729,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25791,7 +26568,8 @@
+@@ -25974,7 +25586,8 @@
  
  
  
@@ -10608,7 +15739,7 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -25824,8 +26602,7 @@
+@@ -26007,8 +25620,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10618,7 +15749,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25999,8 +26776,7 @@
+@@ -26182,8 +25794,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10628,7 +15759,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26166,8 +26942,7 @@
+@@ -26349,8 +25960,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10638,7 +15769,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26343,8 +27118,7 @@
+@@ -26526,8 +26136,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10648,7 +15779,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26424,8 +27198,7 @@
+@@ -26607,8 +26216,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10658,7 +15789,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26593,8 +27366,7 @@
+@@ -26776,8 +26384,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10668,7 +15799,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26672,8 +27444,7 @@
+@@ -26855,8 +26462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10678,7 +15809,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26851,9 +27622,6 @@
+@@ -27034,9 +26640,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10688,7 +15819,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26887,8 +27655,7 @@
+@@ -27070,8 +26673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10698,7 +15829,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26992,8 +27759,7 @@
+@@ -27175,8 +26777,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10708,7 +15839,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27072,9 +27838,6 @@
+@@ -27255,9 +26856,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10718,7 +15849,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27107,8 +27870,7 @@
+@@ -27290,8 +26888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10728,7 +15859,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27211,8 +27973,7 @@
+@@ -27394,8 +26991,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10738,7 +15869,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27302,8 +28063,7 @@
+@@ -27485,8 +27081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10748,7 +15879,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27364,8 +28124,7 @@
+@@ -27547,8 +27142,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10758,7 +15889,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27433,8 +28192,7 @@
+@@ -27616,8 +27210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10768,7 +15899,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27500,8 +28258,7 @@
+@@ -27683,8 +27276,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10778,7 +15909,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27594,8 +28351,7 @@
+@@ -27777,8 +27369,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10788,7 +15919,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27673,8 +28429,7 @@
+@@ -27856,8 +27447,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10798,7 +15929,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27758,8 +28513,7 @@
+@@ -27941,8 +27531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10808,7 +15939,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27827,8 +28581,7 @@
+@@ -28010,8 +27599,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10818,7 +15949,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27923,8 +28676,7 @@
+@@ -28106,8 +27694,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10828,7 +15959,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27988,8 +28740,7 @@
+@@ -28171,8 +27758,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10838,7 +15969,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28084,8 +28835,7 @@
+@@ -28267,8 +27853,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10848,7 +15979,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28149,8 +28899,7 @@
+@@ -28332,8 +27917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10858,7 +15989,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28246,8 +28995,7 @@
+@@ -28429,8 +28013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10868,7 +15999,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28311,8 +29059,7 @@
+@@ -28494,8 +28077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10878,7 +16009,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28409,8 +29156,7 @@
+@@ -28592,8 +28174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10888,7 +16019,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28475,8 +29221,7 @@
+@@ -28658,8 +28239,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10898,7 +16029,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28544,8 +29289,7 @@
+@@ -28727,8 +28307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10908,7 +16039,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28696,8 +29440,7 @@
+@@ -28879,8 +28458,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10918,7 +16049,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28852,8 +29595,7 @@
+@@ -29035,8 +28613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10928,7 +16059,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28918,8 +29660,7 @@
+@@ -29101,8 +28678,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10938,7 +16069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29066,8 +29807,7 @@
+@@ -29249,8 +28825,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10948,7 +16079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29222,8 +29962,7 @@
+@@ -29405,8 +28980,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10958,7 +16089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29279,9 +30018,6 @@
+@@ -29462,9 +29036,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10968,7 +16099,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29315,8 +30051,7 @@
+@@ -29498,8 +29069,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10978,7 +16109,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29420,8 +30155,7 @@
+@@ -29603,8 +29173,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10988,7 +16119,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29521,8 +30255,7 @@
+@@ -29704,8 +29273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10998,7 +16129,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29596,8 +30329,7 @@
+@@ -29779,8 +29347,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11008,7 +16139,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29660,8 +30392,7 @@
+@@ -29843,8 +29410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11018,7 +16149,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29723,8 +30454,7 @@
+@@ -29906,8 +29472,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11028,7 +16159,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29764,8 +30494,7 @@
+@@ -29947,8 +29512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11038,7 +16169,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29821,8 +30550,7 @@
+@@ -30004,8 +29568,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11048,7 +16179,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29862,8 +30590,7 @@
+@@ -30045,8 +29608,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11058,7 +16189,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29927,8 +30654,7 @@
+@@ -30110,8 +29672,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11068,7 +16199,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29959,10 +30685,8 @@
+@@ -30142,10 +29703,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11081,7 +16212,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -30073,8 +30797,7 @@
+@@ -30256,8 +29815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11091,7 +16222,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30136,8 +30859,7 @@
+@@ -30319,8 +29877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11101,7 +16232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30177,8 +30899,7 @@
+@@ -30360,8 +29917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11111,7 +16242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30234,8 +30955,7 @@
+@@ -30417,8 +29973,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11121,7 +16252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30275,8 +30995,7 @@
+@@ -30458,8 +30013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11131,7 +16262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30340,8 +31059,7 @@
+@@ -30523,8 +30077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11141,7 +16272,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30372,10 +31090,8 @@
+@@ -30555,10 +30108,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11154,7 +16285,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -30486,8 +31202,7 @@
+@@ -30669,8 +30220,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11164,7 +16295,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30549,8 +31264,7 @@
+@@ -30732,8 +30282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11174,7 +16305,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30590,8 +31304,7 @@
+@@ -30773,8 +30322,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11184,7 +16315,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30647,8 +31360,7 @@
+@@ -30830,8 +30378,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11194,7 +16325,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30688,8 +31400,7 @@
+@@ -30871,8 +30418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11204,7 +16335,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30753,8 +31464,7 @@
+@@ -30936,8 +30482,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11214,7 +16345,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30785,10 +31495,8 @@
+@@ -30968,10 +30513,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11227,7 +16358,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -30899,8 +31607,7 @@
+@@ -31082,8 +30625,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11237,7 +16368,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30962,8 +31669,7 @@
+@@ -31145,8 +30687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11247,7 +16378,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31003,8 +31709,7 @@
+@@ -31186,8 +30727,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11257,7 +16388,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31060,8 +31765,7 @@
+@@ -31243,8 +30783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11267,7 +16398,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31101,8 +31805,7 @@
+@@ -31284,8 +30823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11277,7 +16408,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31166,8 +31869,7 @@
+@@ -31349,8 +30887,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11287,7 +16418,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31198,10 +31900,8 @@
+@@ -31381,10 +30918,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11300,7 +16431,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -31320,8 +32020,7 @@
+@@ -31503,8 +31038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11310,7 +16441,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31392,8 +32091,7 @@
+@@ -31575,8 +31109,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11320,7 +16451,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31463,8 +32161,7 @@
+@@ -31646,8 +31179,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11330,7 +16461,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31526,8 +32223,7 @@
+@@ -31709,8 +31241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11340,7 +16471,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31567,8 +32263,7 @@
+@@ -31750,8 +31281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11350,7 +16481,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31624,8 +32319,7 @@
+@@ -31807,8 +31337,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11360,7 +16491,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31665,8 +32359,7 @@
+@@ -31848,8 +31377,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11370,7 +16501,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31730,8 +32423,7 @@
+@@ -31913,8 +31441,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11380,7 +16511,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31762,10 +32454,8 @@
+@@ -31945,10 +31472,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11393,7 +16524,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -31877,8 +32567,7 @@
+@@ -32060,8 +31585,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11403,7 +16534,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31940,8 +32629,7 @@
+@@ -32123,8 +31647,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11413,7 +16544,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31981,8 +32669,7 @@
+@@ -32164,8 +31687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11423,7 +16554,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32038,8 +32725,7 @@
+@@ -32221,8 +31743,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11433,7 +16564,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32079,8 +32765,7 @@
+@@ -32262,8 +31783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11443,7 +16574,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32144,8 +32829,7 @@
+@@ -32327,8 +31847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11453,7 +16584,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32176,10 +32860,8 @@
+@@ -32359,10 +31878,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11466,7 +16597,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -32290,8 +32972,7 @@
+@@ -32473,8 +31990,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11476,7 +16607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32372,8 +33053,7 @@
+@@ -32555,8 +32071,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11486,7 +16617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32473,8 +33153,7 @@
+@@ -32656,8 +32171,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11496,7 +16627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32654,8 +33333,7 @@
+@@ -32837,8 +32351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11506,7 +16637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32764,8 +33442,7 @@
+@@ -32947,8 +32460,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11516,7 +16647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32989,8 +33666,7 @@
+@@ -33172,8 +32684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11526,7 +16657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33213,8 +33889,7 @@
+@@ -33396,8 +32907,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11536,7 +16667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33290,8 +33965,7 @@
+@@ -33473,8 +32983,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11546,7 +16677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33517,8 +34191,7 @@
+@@ -33700,8 +33209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11556,7 +16687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33593,8 +34266,7 @@
+@@ -33776,8 +33284,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11566,7 +16697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33654,8 +34326,7 @@
+@@ -33837,8 +33344,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11576,7 +16707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33738,8 +34409,7 @@
+@@ -33921,8 +33427,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11586,7 +16717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33832,8 +34502,7 @@
+@@ -34015,8 +33520,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11596,7 +16727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34007,8 +34676,7 @@
+@@ -34190,8 +33694,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11606,7 +16737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34106,8 +34774,7 @@
+@@ -34289,8 +33792,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11616,7 +16747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34194,8 +34861,7 @@
+@@ -34377,8 +33879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11626,7 +16757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34272,8 +34938,7 @@
+@@ -34455,8 +33956,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11636,25 +16767,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34326,7 +34991,7 @@
+@@ -34509,7 +34009,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 34329: $i/$j" >&5
-+    echo "configure: 34994: $i/$j" >&5
+-    echo "configure: 34512: $i/$j" >&5
++    echo "configure: 34012: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -34624,7 +35289,7 @@
+@@ -34807,7 +34307,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 34627: $i/$j" >&5
-+    echo "configure: 35292: $i/$j" >&5
+-    echo "configure: 34810: $i/$j" >&5
++    echo "configure: 34310: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -35301,8 +35966,7 @@
+@@ -35484,8 +34984,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11664,34 +16795,34 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35460,7 +36124,7 @@
+@@ -35643,7 +35142,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 35463: $i/$j" >&5
-+    echo "configure: 36127: $i/$j" >&5
+-    echo "configure: 35646: $i/$j" >&5
++    echo "configure: 35145: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -35490,7 +36154,7 @@
+@@ -35673,7 +35172,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 35493: $i/$j" >&5
-+    echo "configure: 36157: $i/$j" >&5
+-    echo "configure: 35676: $i/$j" >&5
++    echo "configure: 35175: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -35508,7 +36172,7 @@
+@@ -35691,7 +35190,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 35511: $i/$j" >&5
-+    echo "configure: 36175: $i/$j" >&5
+-    echo "configure: 35694: $i/$j" >&5
++    echo "configure: 35193: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -35796,8 +36460,7 @@
+@@ -35979,8 +35478,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11701,7 +16832,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35892,8 +36555,7 @@
+@@ -36075,8 +35573,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11711,7 +16842,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35986,8 +36648,7 @@
+@@ -36169,8 +35666,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11721,16 +16852,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37361,7 +38022,7 @@
+@@ -37544,7 +37040,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 37364: $i/$j" >&5
-+    echo "configure: 38025: $i/$j" >&5
+-    echo "configure: 37547: $i/$j" >&5
++    echo "configure: 37043: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -37598,8 +38259,7 @@
+@@ -37781,8 +37277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11740,7 +16871,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37683,8 +38343,7 @@
+@@ -37866,8 +37361,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11750,7 +16881,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37776,8 +38435,7 @@
+@@ -37959,8 +37453,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11760,7 +16891,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37944,8 +38602,7 @@
+@@ -38127,8 +37620,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11770,7 +16901,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38100,8 +38757,7 @@
+@@ -38283,8 +37775,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11780,7 +16911,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38176,8 +38832,7 @@
+@@ -38359,8 +37850,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11790,7 +16921,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38219,8 +38874,7 @@
+@@ -38402,8 +37892,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11800,7 +16931,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38277,8 +38931,7 @@
+@@ -38460,8 +37949,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11810,7 +16941,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38408,9 +39061,6 @@
+@@ -38591,9 +38079,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11820,7 +16951,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38441,8 +39091,7 @@
+@@ -38624,8 +38109,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11830,7 +16961,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38543,8 +39192,7 @@
+@@ -38726,8 +38210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11840,7 +16971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38623,9 +39271,6 @@
+@@ -38806,9 +38289,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11850,7 +16981,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38656,8 +39301,7 @@
+@@ -38839,8 +38319,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11860,7 +16991,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38758,8 +39402,7 @@
+@@ -38941,8 +38420,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11870,7 +17001,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38838,9 +39481,6 @@
+@@ -39021,9 +38499,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11880,7 +17011,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38873,8 +39513,7 @@
+@@ -39056,8 +38531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11890,7 +17021,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38977,8 +39616,7 @@
+@@ -39160,8 +38634,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11900,7 +17031,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39056,9 +39694,6 @@
+@@ -39239,9 +38712,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11910,7 +17041,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39091,8 +39726,7 @@
+@@ -39274,8 +38744,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11920,7 +17051,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39195,8 +39829,7 @@
+@@ -39378,8 +38847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11930,7 +17061,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39276,9 +39909,6 @@
+@@ -39459,9 +38927,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11940,7 +17071,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39312,8 +39942,7 @@
+@@ -39495,8 +38960,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11950,7 +17081,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39417,8 +40046,7 @@
+@@ -39600,8 +39064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11960,7 +17091,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39497,9 +40125,6 @@
+@@ -39680,9 +39143,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11970,7 +17101,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39533,8 +40158,7 @@
+@@ -39716,8 +39176,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11980,7 +17111,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39638,8 +40262,7 @@
+@@ -39821,8 +39280,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11990,7 +17121,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39718,9 +40341,6 @@
+@@ -39901,9 +39359,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12000,7 +17131,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39754,8 +40374,7 @@
+@@ -39937,8 +39392,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12010,7 +17141,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39859,8 +40478,7 @@
+@@ -40042,8 +39496,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12020,7 +17151,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39926,7 +40544,9 @@
+@@ -40109,7 +39562,9 @@
  
  
  
@@ -12031,7 +17162,7 @@
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39994,8 +40614,7 @@
+@@ -40177,8 +39632,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12041,7 +17172,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40053,9 +40672,6 @@
+@@ -40236,9 +39690,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12051,7 +17182,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40088,8 +40704,7 @@
+@@ -40271,8 +39722,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12061,7 +17192,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40192,8 +40807,7 @@
+@@ -40375,8 +39825,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12071,7 +17202,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40272,9 +40886,6 @@
+@@ -40455,9 +39904,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12081,7 +17212,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40309,8 +40920,7 @@
+@@ -40492,8 +39938,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12091,7 +17222,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40415,8 +41025,7 @@
+@@ -40598,8 +40043,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12101,7 +17232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40495,9 +41104,6 @@
+@@ -40678,9 +40122,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12111,7 +17242,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40530,8 +41136,7 @@
+@@ -40713,8 +40154,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12121,7 +17252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40634,8 +41239,7 @@
+@@ -40817,8 +40257,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12131,7 +17262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40713,9 +41317,6 @@
+@@ -40896,9 +40335,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12141,7 +17272,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40748,8 +41349,7 @@
+@@ -40931,8 +40367,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12151,7 +17282,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40852,8 +41452,7 @@
+@@ -41035,8 +40470,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12161,7 +17292,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40947,8 +41546,7 @@
+@@ -41130,8 +40564,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12171,7 +17302,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41008,9 +41606,6 @@
+@@ -41191,9 +40624,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12181,7 +17312,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41046,8 +41641,7 @@
+@@ -41229,8 +40659,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12191,7 +17322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41153,8 +41747,7 @@
+@@ -41336,8 +40765,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12201,7 +17332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41412,8 +42005,7 @@
+@@ -41595,8 +41023,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12211,7 +17342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41533,8 +42125,7 @@
+@@ -41716,8 +41143,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12221,7 +17352,24 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41715,8 +42306,7 @@
+@@ -41755,7 +41181,15 @@
+    CXXFLAGS="$CXXFLAGS $USE_RTTI"
+ fi
+ 
+-rgb_file="$x_libraries/X11/rgb.txt"
++
++# Check whether --with-rgbfile or --without-rgbfile was given.
++if test "${with_rgbfile+set}" = set; then
++  withval="$with_rgbfile"
++  rgb_file=$withval
++else
++  rgb_file="$x_libraries/X11/rgb.txt"
++fi;
++
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define X11_RGBFILE "$rgb_file"
+@@ -41898,8 +41332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12231,16 +17379,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41776,7 +42366,7 @@
+@@ -41959,7 +41392,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 41779: $i/$j" >&5
-+    echo "configure: 42369: $i/$j" >&5
+-    echo "configure: 41962: $i/$j" >&5
++    echo "configure: 41395: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -41971,8 +42561,7 @@
+@@ -42154,8 +41587,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12250,7 +17398,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42156,109 +42745,270 @@
+@@ -42339,109 +41771,270 @@
  
  #MIN_CONFIG
  
@@ -12305,7 +17453,8 @@
 +  fi
 +done
 +done
-+
+ 
+-			#include <dns_sd.h>
 +  test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config="no"
 +fi
 +fi
@@ -12318,20 +17467,18 @@
 +echo "${ECHO_T}no" >&6
 +fi
  
--			#include <dns_sd.h>
- 
 -int
 -main ()
 -{
+ 
+-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
+-			TXTRecordDeallocate( (TXTRecordRef*) 0);
 +if test x"$have_pkg_config" == xno; then
 +    { { echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
 +echo "$as_me: error: pkg-config is required to install this program" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
  
--			DNSServiceRefDeallocate( (DNSServiceRef) 0);
--			TXTRecordDeallocate( (TXTRecordRef*) 0);
- 
 -  ;
 -  return 0;
 -}
@@ -12359,6 +17506,10 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
  
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
 +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.
@@ -12387,14 +17538,6 @@
 +done
 +done
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_DNSSD 1
--_ACEOF
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
 -			case $host_os in
 -				darwin*) LIB_DNSSD="" ;;
 -				*) LIB_DNSSD="-ldns_sd" ;;
@@ -12402,14 +17545,21 @@
 -			have_libdns_sd="yes"
 -			echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
 +if test -n "$PKG_CONFIG"; then
 +  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
- 
++
 +fi
 +if test -z "$ac_cv_path_PKG_CONFIG"; then
 +  ac_pt_PKG_CONFIG=$PKG_CONFIG
@@ -12419,9 +17569,7 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  case $ac_pt_PKG_CONFIG in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -12602,7 +17750,7 @@
  
  
  
-@@ -42344,8 +43094,7 @@
+@@ -42527,8 +42120,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12612,7 +17760,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42491,8 +43240,7 @@
+@@ -42674,8 +42266,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12622,7 +17770,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42650,8 +43398,7 @@
+@@ -42833,8 +42424,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12632,7 +17780,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42717,8 +43464,7 @@
+@@ -42900,8 +42490,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12642,7 +17790,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42918,8 +43664,7 @@
+@@ -43101,8 +42690,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12652,7 +17800,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43081,8 +43826,7 @@
+@@ -43264,8 +42852,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12662,7 +17810,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43215,8 +43959,7 @@
+@@ -43398,8 +42985,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12672,7 +17820,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43285,8 +44028,7 @@
+@@ -43468,8 +43054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12682,7 +17830,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43374,8 +44116,7 @@
+@@ -43557,8 +43142,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12692,7 +17840,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43465,8 +44206,7 @@
+@@ -43648,8 +43232,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12702,7 +17850,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43660,8 +44400,7 @@
+@@ -43843,8 +43426,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12712,7 +17860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43727,8 +44466,7 @@
+@@ -43910,8 +43492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12722,7 +17870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43832,8 +44570,7 @@
+@@ -44015,8 +43596,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12732,7 +17880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43934,8 +44671,7 @@
+@@ -44117,8 +43697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12742,7 +17890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44090,8 +44826,7 @@
+@@ -44273,8 +43852,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12752,7 +17900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44135,8 +44870,7 @@
+@@ -44318,8 +43896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12762,7 +17910,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44204,8 +44938,7 @@
+@@ -44387,8 +43964,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12772,7 +17920,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44266,8 +44999,7 @@
+@@ -44449,8 +44025,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12782,7 +17930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44311,8 +45043,7 @@
+@@ -44494,8 +44069,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12792,7 +17940,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44380,8 +45111,7 @@
+@@ -44563,8 +44137,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12802,7 +17950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44447,8 +45177,7 @@
+@@ -44630,8 +44203,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12812,7 +17960,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44734,8 +45463,7 @@
+@@ -44917,8 +44489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12822,7 +17970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44880,8 +45608,7 @@
+@@ -45063,8 +44634,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12832,7 +17980,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45015,8 +45742,7 @@
+@@ -45198,8 +44768,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12842,7 +17990,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45162,8 +45888,7 @@
+@@ -45345,8 +44914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12852,7 +18000,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45254,8 +45979,7 @@
+@@ -45437,8 +45005,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12862,7 +18010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45424,8 +46148,7 @@
+@@ -45607,8 +45174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12872,7 +18020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45496,8 +46219,7 @@
+@@ -45679,8 +45245,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12882,7 +18030,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45549,8 +46271,7 @@
+@@ -45732,8 +45297,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12892,7 +18040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45602,8 +46323,7 @@
+@@ -45785,8 +45349,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12902,7 +18050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45655,8 +46375,7 @@
+@@ -45838,8 +45401,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12912,7 +18060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45712,8 +46431,7 @@
+@@ -45895,8 +45457,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12922,7 +18070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45857,8 +46575,7 @@
+@@ -46040,8 +45601,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12932,7 +18080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45929,8 +46646,7 @@
+@@ -46112,8 +45672,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12942,7 +18090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46268,8 +46984,7 @@
+@@ -46451,8 +46010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12952,7 +18100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46372,8 +47087,7 @@
+@@ -46555,8 +46113,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12962,7 +18110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46442,8 +47156,7 @@
+@@ -46625,8 +46182,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12972,7 +18120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46596,8 +47309,7 @@
+@@ -46779,8 +46335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12982,7 +18130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46707,8 +47419,7 @@
+@@ -46890,8 +46445,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12992,7 +18140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46813,8 +47524,7 @@
+@@ -46996,8 +46550,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13002,7 +18150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46881,8 +47591,7 @@
+@@ -47064,8 +46617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13012,7 +18160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46984,8 +47693,7 @@
+@@ -47167,8 +46719,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13022,7 +18170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47318,8 +48026,7 @@
+@@ -47501,8 +47052,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13032,7 +18180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47408,8 +48115,7 @@
+@@ -47591,8 +47141,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13042,7 +18190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47498,8 +48204,7 @@
+@@ -47681,8 +47230,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13052,7 +18200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47593,8 +48298,7 @@
+@@ -47776,8 +47324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13062,15 +18210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47711,7 +48415,6 @@
- 
- 
- 
--
- 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
- 
-@@ -47767,8 +48470,7 @@
+@@ -47949,8 +47496,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13080,188 +18220,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47816,6 +48518,180 @@
- echo "${ECHO_T}$ac_libthai" >&6
- 
- 
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+    ac_ext=cc
-+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'
-+
-+
-+
-+for ac_header in valgrind/memcheck.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+@@ -48048,8 +47594,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  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
-+
-+# 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;}
-+    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;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists.  ##
-+## ------------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   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
-+
-+
-+
- KJAVA_POLICYPATH=${kde_datadir}/kjava/-
- 
- savex=$exec_prefix
-@@ -47898,8 +48774,7 @@
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48255,8 +47800,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13271,7 +18240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47995,8 +48870,7 @@
+@@ -48352,8 +47896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13281,7 +18250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48114,8 +48988,7 @@
+@@ -48471,8 +48014,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13291,7 +18260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48192,8 +49065,7 @@
+@@ -48549,8 +48091,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13301,16 +18270,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48246,7 +49118,7 @@
+@@ -48603,7 +48144,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 48249: $i/$j" >&5
-+    echo "configure: 49121: $i/$j" >&5
+-    echo "configure: 48606: $i/$j" >&5
++    echo "configure: 48147: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -48339,8 +49211,7 @@
+@@ -48696,8 +48237,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13320,7 +18289,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48436,8 +49307,7 @@
+@@ -48793,8 +48333,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13330,7 +18299,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48609,8 +49479,7 @@
+@@ -48966,8 +48505,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13340,7 +18309,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48744,8 +49613,7 @@
+@@ -49101,8 +48639,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13350,7 +18319,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49037,8 +49905,7 @@
+@@ -49394,8 +48931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13360,7 +18329,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49247,8 +50114,7 @@
+@@ -49604,8 +49140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13370,7 +18339,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49343,8 +50209,7 @@
+@@ -49700,8 +49235,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13380,7 +18349,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49434,8 +50299,7 @@
+@@ -49791,8 +49325,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13390,7 +18359,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49620,8 +50484,7 @@
+@@ -49977,8 +49510,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13400,7 +18369,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49696,8 +50559,7 @@
+@@ -50053,8 +49585,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13410,7 +18379,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49834,8 +50696,7 @@
+@@ -50191,8 +49722,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13420,7 +18389,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49977,8 +50838,7 @@
+@@ -50334,8 +49864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13430,16 +18399,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50065,7 +50925,7 @@
+@@ -50422,7 +49951,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 50068: $i/$j" >&5
-+    echo "configure: 50928: $i/$j" >&5
+-    echo "configure: 50425: $i/$j" >&5
++    echo "configure: 49954: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -50120,8 +50980,7 @@
+@@ -50477,8 +50006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13449,7 +18418,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50421,8 +51280,7 @@
+@@ -50778,8 +50306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13459,7 +18428,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50642,8 +51500,7 @@
+@@ -50999,8 +50526,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13469,25 +18438,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50796,7 +51653,7 @@
+@@ -51153,7 +50679,7 @@
  do
    for j in gssapi.h;
    do
--    echo "configure: 50799: $i/$j" >&5
-+    echo "configure: 51656: $i/$j" >&5
+-    echo "configure: 51156: $i/$j" >&5
++    echo "configure: 50682: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        gssapi_incdir=$i
-@@ -50818,7 +51675,7 @@
+@@ -51175,7 +50701,7 @@
  do
    for j in libgssapi.$ext;
    do
--    echo "configure: 50821: $i/$j" >&5
-+    echo "configure: 51678: $i/$j" >&5
+-    echo "configure: 51178: $i/$j" >&5
++    echo "configure: 50704: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        gssapi_libdir=$i
-@@ -50936,8 +51793,7 @@
+@@ -51293,8 +50819,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13497,7 +18466,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51090,8 +51946,7 @@
+@@ -51447,8 +50972,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13507,7 +18476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51164,8 +52019,7 @@
+@@ -51521,8 +51045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13517,7 +18486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51238,8 +52092,7 @@
+@@ -51595,8 +51118,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13527,7 +18496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51312,8 +52165,7 @@
+@@ -51669,8 +51191,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13537,16 +18506,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51445,7 +52297,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <pcreposix.h>
-+#include <pcre.h>
- int
- main ()
- {
-@@ -51463,8 +52315,7 @@
+@@ -51820,8 +51341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13556,7 +18516,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51584,8 +52435,7 @@
+@@ -51941,8 +51461,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13566,7 +18526,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51661,8 +52511,7 @@
+@@ -52018,8 +51537,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13576,24 +18536,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51793,6 +52642,16 @@
- 
-    fi
- 
-+   aspell_datadir="/usr/lib/aspell"
-+   if test -f "/usr/bin/pspell-config"; then
-+      aspell_datadir=`/usr/bin/pspell-config --pkgdatadir`
-+   fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ASPELL_DATADIR "$aspell_datadir"
-+_ACEOF
-+
- 
- 
- if test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL"; then
-@@ -51869,8 +52728,7 @@
+@@ -52236,8 +51754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13603,7 +18546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51946,8 +52804,7 @@
+@@ -52313,8 +51830,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13613,7 +18556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52163,8 +53020,7 @@
+@@ -52530,8 +52046,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13623,7 +18566,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52331,8 +53187,7 @@
+@@ -52698,8 +52213,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13633,7 +18576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52497,8 +53352,7 @@
+@@ -52864,8 +52378,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13643,7 +18586,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52559,8 +53413,7 @@
+@@ -52926,8 +52439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13653,7 +18596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52627,8 +53480,7 @@
+@@ -52994,8 +52506,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13663,7 +18606,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52708,8 +53560,7 @@
+@@ -53075,8 +52586,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13673,16 +18616,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53343,6 +54194,8 @@
- 
-           ac_config_files="$ac_config_files kdecore/kconfig_compiler/Makefile"
- 
-+          ac_config_files="$ac_config_files kdecore/kconfig_compiler/example/Makefile"
-+
-           ac_config_files="$ac_config_files kdecore/kconfig_compiler/tests/Makefile"
- 
-           ac_config_files="$ac_config_files kdecore/malloc/Makefile"
-@@ -53721,6 +54574,13 @@
+@@ -54090,6 +53600,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -13696,7 +18630,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -53784,13 +54644,6 @@
+@@ -54153,13 +53670,6 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -13710,15 +18644,7 @@
  if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -54656,6 +55509,7 @@
-   "kconf_update/Makefile" ) CONFIG_FILES="$CONFIG_FILES kconf_update/Makefile" ;;
-   "kdecore/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/Makefile" ;;
-   "kdecore/kconfig_compiler/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/kconfig_compiler/Makefile" ;;
-+  "kdecore/kconfig_compiler/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/kconfig_compiler/example/Makefile" ;;
-   "kdecore/kconfig_compiler/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/kconfig_compiler/tests/Makefile" ;;
-   "kdecore/malloc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/malloc/Makefile" ;;
-   "kdecore/network/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdecore/network/Makefile" ;;
-@@ -54925,6 +55779,9 @@
+@@ -55295,6 +54805,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -13728,7 +18654,7 @@
  s, at CC@,$CC,;t t
  s, at CFLAGS@,$CFLAGS,;t t
  s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -55118,9 +55975,11 @@
+@@ -55488,9 +55001,11 @@
  s, at include_VERSION_SCRIPT_TRUE@,$include_VERSION_SCRIPT_TRUE,;t t
  s, at include_VERSION_SCRIPT_FALSE@,$include_VERSION_SCRIPT_FALSE,;t t
  s, at MD5SUM@,$MD5SUM,;t t
@@ -13743,7 +18669,7 @@
  s, at LUA@,$LUA,;t t
  s, at LUA_INCLUDES@,$LUA_INCLUDES,;t t
  s, at LUA_LIBS@,$LUA_LIBS,;t t
-@@ -55154,7 +56013,6 @@
+@@ -55524,7 +55039,6 @@
  s, at KJAVA_POLICYPATH@,$KJAVA_POLICYPATH,;t t
  s, at LIBTIFF@,$LIBTIFF,;t t
  s, at LIB_JASPER@,$LIB_JASPER,;t t
@@ -13751,7 +18677,7 @@
  s, at LIB_EXR@,$LIB_EXR,;t t
  s, at EXR_FLAGS@,$EXR_FLAGS,;t t
  s, at include_TIFF_MODULES_TRUE@,$include_TIFF_MODULES_TRUE,;t t
-@@ -55432,11 +56290,6 @@
+@@ -55802,11 +55316,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -13763,7 +18689,7 @@
    # 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.  */
-@@ -55475,6 +56328,12 @@
+@@ -55845,6 +55354,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -13780,7 +18706,7 @@
 +++ configure.in
 @@ -23,6 +23,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdelibs, "3.5.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdelibs, "3.5.2") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -13805,8 +18731,20 @@
  
  AH_BOTTOM([
  /* provide a definition for a 32 bit entity, usable as a typedef, possibly
-@@ -496,42 +498,21 @@
+@@ -310,7 +312,10 @@
+    CXXFLAGS="$CXXFLAGS $USE_RTTI"
+ fi
  
+-rgb_file="$x_libraries/X11/rgb.txt"
++AC_ARG_WITH([rgbfile],
++  AC_HELP_STRING([--with-rgbfile=path], [Define custom path for rgb.txt. (default: \$(x11libdir)/X11/rgb.txt)]),
++  [rgb_file=$withval], [rgb_file="$x_libraries/X11/rgb.txt"])
++
+ AC_DEFINE_UNQUOTED(X11_RGBFILE, "$rgb_file", [where rgb.txt is in])
+ 
+ AC_MSG_CHECKING([for Compiler version])
+@@ -496,42 +501,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)
@@ -13862,47 +18800,6 @@
  dnl =======================================================
  dnl FILE: ./kate/part/configure.in.in
  dnl =======================================================
-@@ -1420,8 +1401,9 @@
- AC_MSG_RESULT($ac_libthai)
- ])
- 
--
- KDE_CHECK_LIBTHAI
-+
-+KDE_CHECK_HEADERS(valgrind/memcheck.h)
- dnl =======================================================
- dnl FILE: ./khtml/java/configure.in.in
- dnl =======================================================
-@@ -1948,7 +1930,7 @@
-       ac_LDFLAGS_save="$LDFLAGS"
-       LDFLAGS="$LDFLAGS $all_libraries"
-       AC_TRY_LINK(
--         [#include <pcreposix.h>],
-+         [#include <pcre.h>],
-          [regfree(0);],
-          [ac_cv_have_pcreposix="yes"],
-          [ac_cv_have_pcreposix="no"]
-@@ -1995,6 +1977,12 @@
-        AC_LANG_RESTORE
-    fi
- 
-+   aspell_datadir="/usr/lib/aspell"
-+   if test -f "/usr/bin/pspell-config"; then
-+      aspell_datadir=`/usr/bin/pspell-config --pkgdatadir`
-+   fi
-+   
-+   AC_DEFINE_UNQUOTED( ASPELL_DATADIR, ["$aspell_datadir"], [Define where aspell data dir is] )
-    AM_CONDITIONAL(include_aspell_plugin, test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL")
-    
-    AC_ARG_WITH(hspell,AC_HELP_STRING([--with-hspell],[Enable hspell support [default=check]]),[hspell_test="$withval"],[hspell_test="yes"])
-@@ -2258,6 +2246,7 @@
- AC_CONFIG_FILES([ kconf_update/Makefile ])
- AC_CONFIG_FILES([ kdecore/Makefile ])
- AC_CONFIG_FILES([ kdecore/kconfig_compiler/Makefile ])
-+AC_CONFIG_FILES([ kdecore/kconfig_compiler/example/Makefile ])
- AC_CONFIG_FILES([ kdecore/kconfig_compiler/tests/Makefile ])
- AC_CONFIG_FILES([ kdecore/malloc/Makefile ])
- AC_CONFIG_FILES([ kdecore/network/Makefile ])
 --- dcop/client/Makefile.in
 +++ dcop/client/Makefile.in
 @@ -147,6 +147,8 @@
@@ -17538,15 +22435,6 @@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-@@ -485,7 +489,7 @@
- syntaxkatedir = $(kde_datadir)/katepart/syntax
- syntaxkate_DATA = language.dtd syntax.template cpp.xml c.xml html.xml kbasic.xml objectivec.xml \
-                   changelog.xml ada.xml css.xml perl.xml php.xml xml.xml java.xml rpmspec.xml \
--                sql.xml sql-mysql.xml sql-postgresql.xml vhdl.xml diff.xml bash.xml latex.xml postscript.xml ruby.xml \
-+                sql.xml sql-mysql.xml sql-postgresql.xml vhdl.xml diff.xml bash.xml latex.xml postscript.xml ruby.xml rhtml.xml \
-                 desktop.xml eiffel.xml pascal.xml sather.xml python.xml makefile.xml \
-                 ferite.xml scheme.xml matlab.xml tcl.xml ilerpg.xml verilog.xml javascript.xml \
-                 sml.xml winehq.xml cs.xml sgml.xml idconsole.xml xmldebug.xml fortran.xml haskell.xml \
 @@ -507,7 +511,7 @@
  all: docs-am  all-am
  
@@ -17572,7 +22460,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=changelog.xml txt2tags.xml xmldebug.xml ini.xml xslt.xml rib.xml component-pascal.xml pike.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 ahdl.xml lua.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 cue.xml objectivec.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 syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml progress.xml euphoria.xml alert.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.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 e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml xharbour.xml lilypond.xml octave.xml cisco.xml Makefile.am makefile.xml 
+-KDE_DIST=changelog.xml txt2tags.xml xmldebug.xml ini.xml xslt.xml rib.xml component-pascal.xml pike.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 ahdl.xml lua.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 cue.xml objectivec.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 syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml progress.xml euphoria.xml alert.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.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 e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml xharbour.xml lilypond.xml octave.xml cisco.xml Makefile.am rhtml.xml makefile.xml 
 +KDE_DIST=txt2tags.xml changelog.xml xmldebug.xml ini.xml xslt.xml pike.xml component-pascal.xml rib.xml logtalk.xml mediawiki.xml uscript.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 lua.xml ahdl.xml r.xml perl.xml glsl.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 katepartreadonlyui.rc katepartui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml alert.xml progress.xml euphoria.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.xml sml.xml sgml.xml abc.xml velocity.xml diff.xml ldif.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 lex.xml ilerpg.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml picsrc.xml debianchangelog.xml lilypond.xml xharbour.xml cisco.xml octave.xml Makefile.am rhtml.xml makefile.xml 
  
  #>+ 2
@@ -17727,15 +22615,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -815,7 +819,7 @@
- 
- 
- messages:
--	$(EXTRACTRC) ./*/*.rc > rc.cpp
-+	$(EXTRACTRC) ./*/*.rc >> rc.cpp
- 	$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
- 	$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
- apidox-am-yes:
 --- kate/part/Makefile.in
 +++ kate/part/Makefile.in
 @@ -133,6 +133,8 @@
@@ -18649,1015 +23528,82 @@
  	@$(NORMAL_INSTALL)
 --- kdecore/kconfig_compiler/example/Makefile.in
 +++ kdecore/kconfig_compiler/example/Makefile.in
-@@ -0,0 +1,949 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 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.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+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@
-+check_PROGRAMS = example$(EXEEXT)
-+EXTRA_PROGRAMS = autoexample$(EXEEXT)
-+subdir = kdecore/kconfig_compiler/example
-+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 =
-+am_autoexample_OBJECTS = exampleprefs_base.$(OBJEXT) \
-+	autoexample.$(OBJEXT)
-+#>- autoexample_OBJECTS = $(am_autoexample_OBJECTS)
-+#>+ 5
-+autoexample_final_OBJECTS = autoexample.all_cpp.o 
-+autoexample_nofinal_OBJECTS = exampleprefs_base.$(OBJEXT) \
-+	autoexample.$(OBJEXT) general_base.$(OBJEXT) myoptions_base.$(OBJEXT)
-+ at KDE_USE_FINAL_FALSE@autoexample_OBJECTS = $(autoexample_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@autoexample_OBJECTS = $(autoexample_final_OBJECTS)
-+am__DEPENDENCIES_1 =
-+autoexample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+am_example_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
-+#>- example_OBJECTS = $(am_example_OBJECTS)
-+#>+ 4
-+example_final_OBJECTS = example.all_cpp.o 
-+example_nofinal_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
-+ at KDE_USE_FINAL_FALSE@example_OBJECTS = $(example_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@example_OBJECTS = $(example_final_OBJECTS)
-+example_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
-+DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- 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@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
+@@ -112,6 +112,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
 +AVAHI_CFLAGS = @AVAHI_CFLAGS@
 +AVAHI_LIBS = @AVAHI_LIBS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CONF_FILES = @CONF_FILES@
-+CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-+CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOJAVA_FALSE = @DOJAVA_FALSE@
-+DOJAVA_TRUE = @DOJAVA_TRUE@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+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@
-+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_DATA = @INSTALL_DATA@
-+INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-+INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+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_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@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +155,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +267,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MEINPROC = @MEINPROC@
-+MEINPROC_DEP = @MEINPROC_DEP@
-+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@
-+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@
-+XMLLINT = @XMLLINT@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -323,6 +325,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
 +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-+arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+cups_modeldir = @cups_modeldir@
-+datadir = @datadir@
-+dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-+dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-+dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-+dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+exec_prefix = @exec_prefix@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,6 +354,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ 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@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-+include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-+include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-+include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-+include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-+include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-+include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-+include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-+include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-+include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-+include_bzip2_FALSE = @include_bzip2_FALSE@
-+include_bzip2_TRUE = @include_bzip2_TRUE@
-+include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-+include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-+include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-+include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-+interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-+kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-+kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-+kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-+kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-+kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-+kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-+kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-+kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-+kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+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@
-+kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-+kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-+kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-+kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-+kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-+kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-+kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-+kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-+kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-+kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-+kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-+khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-+khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-+kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-+kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-+kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-+kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-+kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-+kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-+kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-+kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-+kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-+knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-+knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-+kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-+kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-+kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-+kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-+kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-+kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-+kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-+kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-+kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-+kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-+kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-+kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-+kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-+kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-+libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-+libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-+libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-+libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-+libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-+licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-+licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-+mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+path_su = @path_su@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-+undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
-+example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+example_LDADD = $(LIB_KDECORE)
-+example_SOURCES = example.cpp exampleprefs_base.cpp
-+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
-+#>- autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
-+#>-   autoexample.cpp  
-+#>+ 2
-+autoexample_SOURCES=exampleprefs_base.cpp   \
-+  autoexample.cpp   general_base.cpp myoptions_base.cpp
-+
-+#>- METASOURCES = AUTO
-+CLEANFILES = exampleprefs_base.h exampleprefs_base.cpp
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -527,7 +531,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit kdecore/kconfig_compiler/example/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
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -565,9 +569,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
-+	@list='$(check_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+autoexample$(EXEEXT): $(autoexample_OBJECTS) $(autoexample_DEPENDENCIES) 
-+	@rm -f autoexample$(EXEEXT)
-+	$(CXXLINK) $(autoexample_LDFLAGS) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
-+example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) 
-+	@rm -f example$(EXEEXT)
-+	$(CXXLINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autoexample.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/example.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exampleprefs_base.Po at am__quote@
-+
-+.cpp.o:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	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; } \
-+	       END { 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:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	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; } \
-+	       END { 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)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    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
-+check-am: all-am
-+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+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:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+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-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-+#>- 	mostlyclean-am
-+#>+ 2
-+clean-am: clean-ui clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libtool \
-+	mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean \
-+	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-+	distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am
-+
-+
-+example.o exampleprefs_base.o: exampleprefs_base.h
-+# avoid running the below command in parallel
-+exampleprefs_base.cpp: exampleprefs_base.h
-+exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../kconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
-+	../kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
-+
-+messages: rc.cpp
-+	true
-+# 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=myoptions_base.ui exampleprefs_base.kcfgc Makefile.in example.kcfg general_base.ui Makefile.am 
-+
-+#>+ 5
-+clean-ui:
-+	-rm -f \
-+	general_base.cpp general_base.h general_base.moc \
-+	myoptions_base.cpp myoptions_base.h myoptions_base.moc 
-+
-+#>+ 2
-+docs-am:
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  kdecore/kconfig_compiler/example/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit kdecore/kconfig_compiler/example/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+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 ! $(CXXCOMPILE)  --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
-+
-+
-+#>+ 11
-+autoexample.all_cpp.cpp: $(srcdir)/Makefile.in exampleprefs_base.cpp $(srcdir)/autoexample.cpp general_base.cpp myoptions_base.cpp  myoptions_base.moc general_base.moc
-+	@echo 'creating autoexample.all_cpp.cpp ...'; \
-+	rm -f autoexample.all_cpp.files autoexample.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> autoexample.all_cpp.final; \
-+	for file in exampleprefs_base.cpp autoexample.cpp general_base.cpp myoptions_base.cpp ; do \
-+	  echo "#include \"$$file\"" >> autoexample.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> autoexample.all_cpp.final; \
-+	done; \
-+	cat autoexample.all_cpp.final autoexample.all_cpp.files > autoexample.all_cpp.cpp; \
-+	rm -f autoexample.all_cpp.final autoexample.all_cpp.files
-+
-+#>+ 11
-+example.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/example.cpp exampleprefs_base.cpp 
-+	@echo 'creating example.all_cpp.cpp ...'; \
-+	rm -f example.all_cpp.files example.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> example.all_cpp.final; \
-+	for file in example.cpp exampleprefs_base.cpp ; do \
-+	  echo "#include \"$$file\"" >> example.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> example.all_cpp.final; \
-+	done; \
-+	cat example.all_cpp.final example.all_cpp.files > example.all_cpp.cpp; \
-+	rm -f example.all_cpp.final example.all_cpp.files
-+
-+#>+ 3
-+clean-final:
-+	-rm -f autoexample.all_cpp.cpp example.all_cpp.cpp
-+
-+#>+ 3
-+final:
-+	$(MAKE) autoexample_OBJECTS="$(autoexample_final_OBJECTS)" example_OBJECTS="$(example_final_OBJECTS)" all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) autoexample_OBJECTS="$(autoexample_final_OBJECTS)" example_OBJECTS="$(example_final_OBJECTS)" install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) autoexample_OBJECTS="$(autoexample_nofinal_OBJECTS)" example_OBJECTS="$(example_nofinal_OBJECTS)" all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) autoexample_OBJECTS="$(autoexample_nofinal_OBJECTS)" example_OBJECTS="$(example_nofinal_OBJECTS)" install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 4
-+nmcheck: 
-+$(srcdir)/autoexample.cpp: general_base.h myoptions_base.h 
-+nmcheck-am: nmcheck
-+
-+#>+ 30
-+general_base.cpp: $(srcdir)/general_base.ui general_base.h general_base.moc
-+	rm -f general_base.cpp
-+	echo '#include <kdialog.h>' > general_base.cpp
-+	echo '#include <klocale.h>' >> general_base.cpp
-+	$(UIC) -tr ${UIC_TR} -i general_base.h $(srcdir)/general_base.ui > general_base.cpp.temp ; ret=$$?; \
-+	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" general_base.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_general_base,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> general_base.cpp ;\
-+	rm -f general_base.cpp.temp ;\
-+	if test "$$ret" = 0; then echo '#include "general_base.moc"' >> general_base.cpp; else rm -f general_base.cpp ; exit $$ret ; fi
-+
-+general_base.h: $(srcdir)/general_base.ui
-+	rm -rf general_base.h;
-+	$(UIC) $(srcdir)/general_base.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> general_base.h ;
-+general_base.moc: general_base.h
-+	$(MOC) general_base.h -o general_base.moc
-+
-+myoptions_base.cpp: $(srcdir)/myoptions_base.ui myoptions_base.h myoptions_base.moc
-+	rm -f myoptions_base.cpp
-+	echo '#include <kdialog.h>' > myoptions_base.cpp
-+	echo '#include <klocale.h>' >> myoptions_base.cpp
-+	$(UIC) -tr ${UIC_TR} -i myoptions_base.h $(srcdir)/myoptions_base.ui > myoptions_base.cpp.temp ; ret=$$?; \
-+	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" myoptions_base.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_myoptions_base,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> myoptions_base.cpp ;\
-+	rm -f myoptions_base.cpp.temp ;\
-+	if test "$$ret" = 0; then echo '#include "myoptions_base.moc"' >> myoptions_base.cpp; else rm -f myoptions_base.cpp ; exit $$ret ; fi
-+
-+myoptions_base.h: $(srcdir)/myoptions_base.ui
-+	rm -rf myoptions_base.h;
-+	$(UIC) $(srcdir)/myoptions_base.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> myoptions_base.h ;
-+myoptions_base.moc: myoptions_base.h
-+	$(MOC) myoptions_base.h -o myoptions_base.moc
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-checkPROGRAMS:
 --- kdecore/kconfig_compiler/Makefile.in
 +++ kdecore/kconfig_compiler/Makefile.in
-@@ -39,10 +39,8 @@
- host_triplet = @host@
- target_triplet = @target@
- bin_PROGRAMS = kconfig_compiler$(EXEEXT)
--check_PROGRAMS = example$(EXEEXT)
--EXTRA_PROGRAMS = autoexample$(EXEEXT)
- subdir = kdecore/kconfig_compiler
--DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+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
-@@ -58,29 +56,11 @@
- am__installdirs = "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
--am_autoexample_OBJECTS = exampleprefs_base.$(OBJEXT) \
--	autoexample.$(OBJEXT)
--#>- autoexample_OBJECTS = $(am_autoexample_OBJECTS)
--#>+ 5
--autoexample_final_OBJECTS = autoexample.all_cpp.o 
--autoexample_nofinal_OBJECTS = exampleprefs_base.$(OBJEXT) \
--	autoexample.$(OBJEXT) general_base.$(OBJEXT) myoptions_base.$(OBJEXT)
-- at KDE_USE_FINAL_FALSE@autoexample_OBJECTS = $(autoexample_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@autoexample_OBJECTS = $(autoexample_final_OBJECTS)
--am__DEPENDENCIES_1 =
--autoexample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
--am_example_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
--#>- example_OBJECTS = $(am_example_OBJECTS)
--#>+ 4
--example_final_OBJECTS = example.all_cpp.o 
--example_nofinal_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
-- at KDE_USE_FINAL_FALSE@example_OBJECTS = $(example_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@example_OBJECTS = $(example_final_OBJECTS)
--example_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_kconfig_compiler_OBJECTS = kconfig_compiler.$(OBJEXT)
- #>- kconfig_compiler_OBJECTS = $(am_kconfig_compiler_OBJECTS)
- #>+ 1
- kconfig_compiler_OBJECTS = kconfig_compiler.$(OBJEXT)
-+am__DEPENDENCIES_1 =
- kconfig_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@@ -103,10 +83,8 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
--	$(kconfig_compiler_SOURCES)
--DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
--	$(kconfig_compiler_SOURCES)
-+SOURCES = $(kconfig_compiler_SOURCES)
-+DIST_SOURCES = $(kconfig_compiler_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- #>- 	html-recursive info-recursive install-data-recursive \
- #>- 	install-exec-recursive install-info-recursive \
-@@ -138,6 +116,8 @@
+@@ -116,6 +116,8 @@
  AUTODIRS = @AUTODIRS@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19666,7 +23612,7 @@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
-@@ -179,8 +159,6 @@
+@@ -157,8 +159,6 @@
  GSSAPI_INCS = @GSSAPI_INCS@
  GSSAPI_LIBS = @GSSAPI_LIBS@
  GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -19675,7 +23621,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  HAVE_MITSHM = @HAVE_MITSHM@
  HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -257,7 +235,6 @@
+@@ -235,7 +235,6 @@
  LIBXSLT_RPATH = @LIBXSLT_RPATH@
  LIBZ = @LIBZ@
  LIB_CUPS = @LIB_CUPS@
@@ -19683,7 +23629,7 @@
  LIB_EXR = @LIB_EXR@
  LIB_IDN = @LIB_IDN@
  LIB_JASPER = @LIB_JASPER@
-@@ -294,6 +271,9 @@
+@@ -272,6 +271,9 @@
  LUA = @LUA@
  LUA_INCLUDES = @LUA_INCLUDES@
  LUA_LIBS = @LUA_LIBS@
@@ -19693,7 +23639,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +329,7 @@
+@@ -327,6 +329,7 @@
  ac_ct_F77 = @ac_ct_F77@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
@@ -19701,7 +23647,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,6 +358,7 @@
+@@ -355,6 +358,7 @@
  doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
  doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
  exec_prefix = @exec_prefix@
@@ -19709,33 +23655,7 @@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-@@ -533,24 +515,11 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--SUBDIRS = tests
-+SUBDIRS = example tests
- AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
- kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- kconfig_compiler_LDADD = $(LIB_KDECORE)
- kconfig_compiler_SOURCES = kconfig_compiler.cpp
--example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--example_LDADD = $(LIB_KDECORE)
--example_SOURCES = example.cpp exampleprefs_base.cpp
--autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
--#>- autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
--#>-   autoexample.cpp  
--#>+ 2
--autoexample_SOURCES=exampleprefs_base.cpp   \
--  autoexample.cpp   general_base.cpp myoptions_base.cpp
--
--#>- METASOURCES = AUTO
--CLEANFILES = exampleprefs_base.h exampleprefs_base.cpp
- TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
- #>- all: all-recursive
- #>+ 1
-@@ -558,7 +527,7 @@
+@@ -523,7 +527,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19744,7 +23664,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +565,9 @@
+@@ -561,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19756,211 +23676,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -628,19 +597,6 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--
--clean-checkPROGRAMS:
--	@list='$(check_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--	  echo " rm -f $$p $$f"; \
--	  rm -f $$p $$f ; \
--	done
--autoexample$(EXEEXT): $(autoexample_OBJECTS) $(autoexample_DEPENDENCIES) 
--	@rm -f autoexample$(EXEEXT)
--	$(CXXLINK) $(autoexample_LDFLAGS) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
--example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) 
--	@rm -f example$(EXEEXT)
--	$(CXXLINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS)
- kconfig_compiler$(EXEEXT): $(kconfig_compiler_OBJECTS) $(kconfig_compiler_DEPENDENCIES) 
- 	@rm -f kconfig_compiler$(EXEEXT)
- 	$(CXXLINK) $(kconfig_compiler_LDFLAGS) $(kconfig_compiler_OBJECTS) $(kconfig_compiler_LDADD) $(LIBS)
-@@ -651,9 +607,6 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autoexample.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/example.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exampleprefs_base.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kconfig_compiler.Po at am__quote@
- 
- .cpp.o:
-@@ -862,7 +815,6 @@
- 	  fi; \
- 	done
- check-am: all-am
--	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
- 	$(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-recursive
- all-am: Makefile $(PROGRAMS)
-@@ -888,7 +840,6 @@
- mostlyclean-generic:
- 
- clean-generic:
--	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-@@ -900,11 +851,9 @@
- #>+ 1
- clean: kde-rpo-clean  clean-recursive
- 
--#>- clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
--#>- 	clean-libtool mostlyclean-am
--#>+ 2
--clean-am: clean-ui clean-bcheck clean-final  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
--	clean-libtool mostlyclean-am
-+#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-bcheck  clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
- 
- distclean: distclean-recursive
- 	-rm -rf ./$(DEPDIR)
-@@ -955,27 +904,21 @@
- uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	check-local clean clean-binPROGRAMS clean-checkPROGRAMS \
--	clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
-+	check-local clean clean-binPROGRAMS clean-generic \
-+	clean-libtool clean-recursive ctags ctags-recursive distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- 	uninstall-binPROGRAMS uninstall-info-am
- 
- 
--example.o exampleprefs_base.o: exampleprefs_base.h
--# avoid running the below command in parallel
--exampleprefs_base.cpp: exampleprefs_base.h
--exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg kconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
--	./kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
--
- check-local:
- 	for i in $(TESTFILES); \
- 	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
-@@ -986,13 +929,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=myoptions_base.ui exampleprefs_base.kcfgc Makefile.in kcfg.xsd README.dox example.kcfg checkkcfg.pl general_base.ui Makefile.am 
--
--#>+ 5
--clean-ui:
--	-rm -f \
--	general_base.cpp general_base.h general_base.moc \
--	myoptions_base.cpp myoptions_base.h myoptions_base.moc 
-+KDE_DIST=Makefile.in kcfg.xsd README.dox checkkcfg.pl Makefile.am 
- 
- #>+ 2
- docs-am:
-@@ -1035,86 +972,26 @@
- 	done
- 
- 
--#>+ 11
--autoexample.all_cpp.cpp: $(srcdir)/Makefile.in exampleprefs_base.cpp $(srcdir)/autoexample.cpp general_base.cpp myoptions_base.cpp  myoptions_base.moc general_base.moc
--	@echo 'creating autoexample.all_cpp.cpp ...'; \
--	rm -f autoexample.all_cpp.files autoexample.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> autoexample.all_cpp.final; \
--	for file in exampleprefs_base.cpp autoexample.cpp general_base.cpp myoptions_base.cpp ; do \
--	  echo "#include \"$$file\"" >> autoexample.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> autoexample.all_cpp.final; \
--	done; \
--	cat autoexample.all_cpp.final autoexample.all_cpp.files > autoexample.all_cpp.cpp; \
--	rm -f autoexample.all_cpp.final autoexample.all_cpp.files
--
--#>+ 11
--example.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/example.cpp exampleprefs_base.cpp 
--	@echo 'creating example.all_cpp.cpp ...'; \
--	rm -f example.all_cpp.files example.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> example.all_cpp.final; \
--	for file in example.cpp exampleprefs_base.cpp ; do \
--	  echo "#include \"$$file\"" >> example.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> example.all_cpp.final; \
--	done; \
--	cat example.all_cpp.final example.all_cpp.files > example.all_cpp.cpp; \
--	rm -f example.all_cpp.final example.all_cpp.files
--
--#>+ 3
--clean-final:
--	-rm -f autoexample.all_cpp.cpp example.all_cpp.cpp
--
- #>+ 3
- final:
--	$(MAKE) autoexample_OBJECTS="$(autoexample_final_OBJECTS)" example_OBJECTS="$(example_final_OBJECTS)" all-am
-+	$(MAKE) all-am
- 
- #>+ 3
- final-install:
--	$(MAKE) autoexample_OBJECTS="$(autoexample_final_OBJECTS)" example_OBJECTS="$(example_final_OBJECTS)" install-am
-+	$(MAKE) install-am
- 
- #>+ 3
- no-final:
--	$(MAKE) autoexample_OBJECTS="$(autoexample_nofinal_OBJECTS)" example_OBJECTS="$(example_nofinal_OBJECTS)" all-am
-+	$(MAKE) all-am
- 
- #>+ 3
- no-final-install:
--	$(MAKE) autoexample_OBJECTS="$(autoexample_nofinal_OBJECTS)" example_OBJECTS="$(example_nofinal_OBJECTS)" install-am
-+	$(MAKE) install-am
- 
- #>+ 3
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 4
-+#>+ 3
- nmcheck: 
--$(srcdir)/autoexample.cpp: general_base.h myoptions_base.h 
- nmcheck-am: nmcheck
--
--#>+ 30
--general_base.cpp: $(srcdir)/general_base.ui general_base.h general_base.moc
--	rm -f general_base.cpp
--	echo '#include <kdialog.h>' > general_base.cpp
--	echo '#include <klocale.h>' >> general_base.cpp
--	$(UIC) -tr ${UIC_TR} -i general_base.h $(srcdir)/general_base.ui > general_base.cpp.temp ; ret=$$?; \
--	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" general_base.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_general_base,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> general_base.cpp ;\
--	rm -f general_base.cpp.temp ;\
--	if test "$$ret" = 0; then echo '#include "general_base.moc"' >> general_base.cpp; else rm -f general_base.cpp ; exit $$ret ; fi
--
--general_base.h: $(srcdir)/general_base.ui
--	rm -rf general_base.h;
--	$(UIC) $(srcdir)/general_base.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> general_base.h ;
--general_base.moc: general_base.h
--	$(MOC) general_base.h -o general_base.moc
--
--myoptions_base.cpp: $(srcdir)/myoptions_base.ui myoptions_base.h myoptions_base.moc
--	rm -f myoptions_base.cpp
--	echo '#include <kdialog.h>' > myoptions_base.cpp
--	echo '#include <klocale.h>' >> myoptions_base.cpp
--	$(UIC) -tr ${UIC_TR} -i myoptions_base.h $(srcdir)/myoptions_base.ui > myoptions_base.cpp.temp ; ret=$$?; \
--	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" myoptions_base.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_myoptions_base,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> myoptions_base.cpp ;\
--	rm -f myoptions_base.cpp.temp ;\
--	if test "$$ret" = 0; then echo '#include "myoptions_base.moc"' >> myoptions_base.cpp; else rm -f myoptions_base.cpp ; exit $$ret ; fi
--
--myoptions_base.h: $(srcdir)/myoptions_base.ui
--	rm -rf myoptions_base.h;
--	$(UIC) $(srcdir)/myoptions_base.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> myoptions_base.h ;
--myoptions_base.moc: myoptions_base.h
--	$(MOC) myoptions_base.h -o myoptions_base.moc
 --- kdecore/kconfig_compiler/tests/Makefile.in
 +++ kdecore/kconfig_compiler/tests/Makefile.in
 @@ -194,6 +194,8 @@
@@ -27110,49 +30825,7 @@
  mostlyclean-libtool:
 --- kio/tests/Makefile.in
 +++ kio/tests/Makefile.in
-@@ -85,6 +85,13 @@
- 	$(top_builddir)/kio/kssl/ksslconfig.h \
- 	$(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
-+am__DEPENDENCIES_1 =
-+kunittest_kdirwatch_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
-+am_kunittest_kdirwatch_la_OBJECTS = kdirwatchunittest.lo
-+#>- kunittest_kdirwatch_la_OBJECTS = $(am_kunittest_kdirwatch_la_OBJECTS)
-+#>+ 1
-+kunittest_kdirwatch_la_OBJECTS = kdirwatchunittest.lo
- am__installdirs = "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
-@@ -93,7 +100,6 @@
- #>+ 1
- dataprotocoltest_OBJECTS = dataprotocoltest.$(OBJEXT)
- dataprotocoltest_LDADD = $(LDADD)
--am__DEPENDENCIES_1 =
- dataprotocoltest_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_getalltest_OBJECTS = getalltest.$(OBJEXT)
- #>- getalltest_OBJECTS = $(am_getalltest_OBJECTS)
-@@ -302,7 +308,8 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
-+SOURCES = $(kunittest_kdirwatch_la_SOURCES) \
-+	$(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
- 	$(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
- 	$(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
- 	$(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) \
-@@ -318,7 +325,8 @@
- 	$(kziptest_SOURCES) $(metatest_SOURCES) \
- 	$(netaccesstest_SOURCES) $(previewtest_SOURCES) \
- 	$(speed_SOURCES)
--DIST_SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
-+DIST_SOURCES = $(kunittest_kdirwatch_la_SOURCES) \
-+	$(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
- 	$(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
- 	$(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
- 	$(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) \
-@@ -351,6 +359,8 @@
+@@ -359,6 +359,8 @@
  AUTODIRS = @AUTODIRS@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -27161,7 +30834,7 @@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
-@@ -392,8 +402,6 @@
+@@ -400,8 +402,6 @@
  GSSAPI_INCS = @GSSAPI_INCS@
  GSSAPI_LIBS = @GSSAPI_LIBS@
  GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -27170,7 +30843,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  HAVE_MITSHM = @HAVE_MITSHM@
  HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -470,7 +478,6 @@
+@@ -478,7 +478,6 @@
  LIBXSLT_RPATH = @LIBXSLT_RPATH@
  LIBZ = @LIBZ@
  LIB_CUPS = @LIB_CUPS@
@@ -27178,7 +30851,7 @@
  LIB_EXR = @LIB_EXR@
  LIB_IDN = @LIB_IDN@
  LIB_JASPER = @LIB_JASPER@
-@@ -507,6 +514,9 @@
+@@ -515,6 +514,9 @@
  LUA = @LUA@
  LUA_INCLUDES = @LUA_INCLUDES@
  LUA_LIBS = @LUA_LIBS@
@@ -27188,7 +30861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,6 +572,7 @@
+@@ -570,6 +572,7 @@
  ac_ct_F77 = @ac_ct_F77@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
@@ -27196,7 +30869,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -590,6 +601,7 @@
+@@ -598,6 +601,7 @@
  doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
  doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
  exec_prefix = @exec_prefix@
@@ -27204,17 +30877,7 @@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-@@ -783,13 +795,17 @@
- kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
- kmimetypetest_SOURCES = kmimetypetest.cpp
- kacltest_SOURCES = kacltest.cpp
-+check_LTLIBRARIES = kunittest_kdirwatch.la
-+kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-+kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
-+kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
+@@ -801,7 +805,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27223,7 +30886,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -827,10 +843,21 @@
+@@ -839,9 +843,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27233,133 +30896,46 @@
 -$(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:
-+	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
-+	@list='$(check_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+kunittest_kdirwatch.la: $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_DEPENDENCIES) 
-+	$(CXXLINK)  $(kunittest_kdirwatch_la_LDFLAGS) $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -977,6 +1004,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdefaultprogresstest.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirlistertest.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirwatchtest.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirwatchunittest.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kfiltertest.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kionetrctest.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kiopassdlgtest.Po at am__quote@
-@@ -1182,7 +1210,7 @@
- 	  fi; \
- 	done
- check-am: all-am
--	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-+	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
- check: check-am
- all-am: Makefile $(PROGRAMS)
-@@ -1218,11 +1246,11 @@
- #>+ 1
- clean: kde-rpo-clean  clean-am
  
--#>- clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
--#>- 	clean-libtool mostlyclean-am
-+#>- clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
-+#>- 	clean-generic clean-libtool mostlyclean-am
- #>+ 2
--clean-am: clean-metasources clean-bcheck  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
--	clean-libtool mostlyclean-am
-+clean-am: clean-metasources clean-bcheck  clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
-+	clean-generic clean-libtool mostlyclean-am
+ clean-checkLTLIBRARIES:
+@@ -1357,18 +1361,18 @@
+ mocs: jobtest.moc
  
- distclean: distclean-am
- 	-rm -rf ./$(DEPDIR)
-@@ -1271,17 +1299,18 @@
- uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+ #>+ 3
+-kdirwatchunittest.moc: $(srcdir)/kdirwatchunittest.h
+-	$(MOC) $(srcdir)/kdirwatchunittest.h -o kdirwatchunittest.moc
++kdirwatchtest.moc: $(srcdir)/kdirwatchtest.h
++	$(MOC) $(srcdir)/kdirwatchtest.h -o kdirwatchtest.moc
  
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
--	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
--	clean-libtool ctags distclean distclean-compile \
--	distclean-generic distclean-libtool distclean-tags distdir dvi \
--	dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-binPROGRAMS uninstall-info-am
-+	clean clean-binPROGRAMS clean-checkLTLIBRARIES \
-+	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-+	distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-binPROGRAMS \
-+	uninstall-info-am
+ #>+ 2
+-mocs: kdirwatchunittest.moc
++mocs: kdirwatchtest.moc
  
- 
- # Unfortunately some tests depend on the network settings, it seems
-@@ -1339,6 +1368,13 @@
- mocs: kdirwatchtest.moc
- 
  #>+ 3
+-kdirwatchtest.moc: $(srcdir)/kdirwatchtest.h
+-	$(MOC) $(srcdir)/kdirwatchtest.h -o kdirwatchtest.moc
 +kdirwatchunittest.moc: $(srcdir)/kdirwatchunittest.h
 +	$(MOC) $(srcdir)/kdirwatchunittest.h -o kdirwatchunittest.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: kdirwatchtest.moc
 +mocs: kdirwatchunittest.moc
-+
-+#>+ 3
+ 
+ #>+ 3
  kioslavetest.moc: $(srcdir)/kioslavetest.h
- 	$(MOC) $(srcdir)/kioslavetest.h -o kioslavetest.moc
+@@ -1400,10 +1404,10 @@
  
-@@ -1368,10 +1404,10 @@
- 
  #>+ 3
  clean-metasources:
--	-rm -f  kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
+-	-rm -f  kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchunittest.moc kdirwatchtest.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 kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am 
+-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 
 +KDE_DIST=kdirwatchtest.h kacltest.h dummymeta.desktop Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kdirwatchunittest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am 
  
  #>+ 2
  docs-am:
-@@ -1434,7 +1470,8 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 21
-+#>+ 23
-+kdirwatchunittest.o: kdirwatchunittest.moc 
- dummymeta.o: dummymeta.moc 
- kruntest.lo: kruntest.moc 
- kioslavetest.lo: kioslavetest.moc 
-@@ -1448,10 +1485,11 @@
- nmcheck-am: nmcheck
- kdcopcheck.lo: kdcopcheck.moc 
- dummymeta.lo: dummymeta.moc 
--previewtest.lo: previewtest.moc 
- speed.o: speed.moc 
-+previewtest.lo: previewtest.moc 
- kdirlistertest.lo: kdirlistertest.moc 
- previewtest.o: previewtest.moc 
-+kdirwatchunittest.lo: kdirwatchunittest.moc 
- jobtest.lo: jobtest.moc 
- kdcopcheck.o: kdcopcheck.moc 
- speed.lo: speed.moc 
 --- kioslave/bzip2/Makefile.in
 +++ kioslave/bzip2/Makefile.in
 @@ -112,6 +112,8 @@
@@ -31777,42 +35353,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- Makefile.am
-+++ Makefile.am
-@@ -40,27 +40,27 @@
- 
- messages:
- 	cd kabc/scripts && perl ./makeaddressee
--	find . -type d | grep -v CVS | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
-+	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
- 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
- 	for dir in $$mfs; do \
--	  if test ! "$$dir" = "./Makefile.am"; then \
-+	  if test "$$dir" != "./Makefile.am"; then \
- 	    dir=`dirname $$dir` ;\
- 	    egrep -v "^$$dir" dirs > dirs.new && mv dirs.new dirs ;\
- 	  fi ;\
- 	done
--	egrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
-+	fgrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
- 	dirs=`cat dirs` ;\
- 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
- 	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"` > rc.cpp	;\
-+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
- 	: > kde.pot ;\
- 	$(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 rc.cpp dirs
-+	rm -f dirs
- 
--EXTRA_DIST = admin bsd-port debian kdelibs.spec.in kde.pot \
-+EXTRA_DIST = admin kde.pot \
- 	COMPILING COMPILING.html COPYING.BSD DEBUG \
- 	KDE2PORTING.html NAMING common_texts.cpp kdelibs.lsm kdoc.rules \
- 	qt-messages.pot configure.in.in configure.in.mid configure.in.bot
 --- Makefile.in
 +++ Makefile.in
 @@ -130,6 +130,8 @@
@@ -31867,15 +35407,6 @@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-@@ -529,7 +533,7 @@
- AUTOMAKE_OPTIONS = foreign 1.5
- potdir = $(kde_includes)
- pot_DATA = kde.pot
--EXTRA_DIST = admin bsd-port debian kdelibs.spec.in kde.pot \
-+EXTRA_DIST = admin kde.pot \
- 	COMPILING COMPILING.html COPYING.BSD DEBUG \
- 	KDE2PORTING.html NAMING common_texts.cpp kdelibs.lsm kdoc.rules \
- 	qt-messages.pot configure.in.in configure.in.mid configure.in.bot
 @@ -544,7 +548,7 @@
  .SUFFIXES:
  am--refresh:
@@ -31909,37 +35440,6 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1037,25 +1041,25 @@
- 
- messages:
- 	cd kabc/scripts && perl ./makeaddressee
--	find . -type d | grep -v CVS | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
-+	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
- 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
- 	for dir in $$mfs; do \
--	  if test ! "$$dir" = "./Makefile.am"; then \
-+	  if test "$$dir" != "./Makefile.am"; then \
- 	    dir=`dirname $$dir` ;\
- 	    egrep -v "^$$dir" dirs > dirs.new && mv dirs.new dirs ;\
- 	  fi ;\
- 	done
--	egrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
-+	fgrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
- 	dirs=`cat dirs` ;\
- 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
- 	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"` > rc.cpp	;\
-+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
- 	: > kde.pot ;\
- 	$(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 rc.cpp dirs
-+	rm -f dirs
- 
- dist-hook:
- 	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
 @@ -1215,7 +1219,7 @@
  .NOEXPORT:
  
@@ -32171,15 +35671,6 @@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-@@ -482,7 +486,7 @@
-     x-vnd.trolltech.qpicture.desktop x-vnd.adobe.photoshop.desktop \
-     x-xcursor.desktop pjpeg.desktop x-exr.desktop \
-     x-rgb.desktop x-dds.desktop x-djvu.desktop x-djvu-2.desktop x-hdr.desktop \
--    fits.desktop
-+    fits.desktop x-raw.desktop
- 
- mimetypeimagedatadir = $(kde_mimedir)/image
- EXTRA_DIST = $(mimetypeimagedata_DATA)
 @@ -491,7 +495,7 @@
  all: docs-am  all-am
  
@@ -32201,15 +35692,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -695,7 +699,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=fax-g3.desktop x-ico.desktop jpg.desktop x-photo-cd.desktop x-vnd.trolltech.qpicture.desktop x-portable-pixmap.desktop tiff.desktop x-xcf-gimp.desktop x-msod.desktop Makefile.in x-djvu.desktop x-wmf.desktop x-bmp.desktop svg+xml.desktop x-xcursor.desktop uninstall.desktop x-pcx.desktop x-xpm.desktop x-hdr.desktop svg-xml.desktop x-portable-greymap.desktop png.desktop x-exr.desktop x-djvu-2.desktop x-eps.desktop pjpeg.desktop x-rgb.desktop fits.desktop x-targa.desktop x-jng.desktop x-portable-bitmap.desktop x-xbm.desktop jpeg.desktop x-vnd.adobe.photoshop.desktop gif.desktop x-xfig.desktop x-dds.desktop cgm.desktop jp2.desktop Makefile.am 
-+KDE_DIST=fax-g3.desktop x-ico.desktop jpg.desktop x-photo-cd.desktop x-vnd.trolltech.qpicture.desktop x-portable-pixmap.desktop tiff.desktop x-xcf-gimp.desktop x-msod.desktop Makefile.in x-djvu.desktop x-wmf.desktop x-bmp.desktop svg+xml.desktop x-xcursor.desktop uninstall.desktop x-pcx.desktop x-xpm.desktop x-hdr.desktop svg-xml.desktop x-portable-greymap.desktop png.desktop x-exr.desktop x-djvu-2.desktop x-eps.desktop pjpeg.desktop x-rgb.desktop fits.desktop x-targa.desktop x-jng.desktop x-portable-bitmap.desktop x-xbm.desktop jpeg.desktop x-vnd.adobe.photoshop.desktop gif.desktop x-xfig.desktop x-dds.desktop cgm.desktop jp2.desktop Makefile.am x-raw.desktop 
- 
- #>+ 2
- docs-am:
 --- mimetypes/inode/Makefile.in
 +++ mimetypes/inode/Makefile.in
 @@ -78,6 +78,8 @@
@@ -32894,17 +36376,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -702,3890 +706,3890 @@
+@@ -702,3896 +706,3896 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png cr16-action-about_kde.png crsc-mime-zip.svgz cr32-action-mail_post_to.png cr48-action-rotate_ccw.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 cr32-action-messagebox_critical.png crsc-device-zip_unmount.svgz 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 cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr48-device-ipod_unmount.png cr16-action-2rightarrow.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr64-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr16-device-3floppy_mount.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 crsc-mime-source.svgz cr128-filesys-folder_yellow.png 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 cr32-filesys-desktop.png cr16-mime-postscript.png cr16-action-text.png cr32-mime-pdf.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 cr32-action-bookmark_folder.png crsc-action-back.svgz cr22-mime-info.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-player_end.png cr16-action-fileopen.png cr128-app-password.png cr48-mime-source_moc.png cr64-mime-source_php.png cr22-action-encrypted.png cr22-action-make_kdevelop.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-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr128-mime-pdf.png cr22-action-pencil.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-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.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 cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr16-action-lock.png cr22-action-music_halfnote.png cr64-mime-dvi.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-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz 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 cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.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 cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png cr32-mime-txt2.png cr22-action-mail_reply.png crsc-mime-source_s.svgz cr32-device-usbpendrive_mount.png cr128-mime-resource.png cr16-mime-core.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 cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr16-action-viewmag+.png cr16-action-exit.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz 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-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 cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr32-action-bookmarks_list_add.png cr128-mime-exec_wine.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 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 cr16-mime-metafont.png crsc-device-mouse.svgz cr16-action-music_sixteenthnote.png cr22-mime-source_p.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 cr16-filesys-file_broken.png cr22-mime-kchart_chrt.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 cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz 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 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 cr22-filesys-folder_green_open.png cr32-mime-source.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 crsc-filesys-folder_txt.svgz cr16-mime-deb.png cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz 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 cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-player_pause.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 cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.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 cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.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 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 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-kchart_chrt.png cr16-mime-txt2.png cr16-mime-binary.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 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 cr22-action-add.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.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-filesys-folder_red_open.png cr22-action-player_stop.png cr32-action-connect_creating.png cr64-mime-colorscm.png crsc-mime-koffice.svgz cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-find.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 cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr32-action-mail_find.png cr128-filesys-network.png cr32-action-view_bottom.png crsc-device-compact_flash_unmount.svgz crsc-mime-message.svgz 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 cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr48-mime-video.png cr22-action-contexthelp.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.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 cr64-mime-kivio_flw.png cr128-mime-karbon_karbon.png cr48-filesys-folder_important.png cr48-filesys-exec.png cr48-filesys-network_local.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 cr64-device-dvd_mount.png cr128-mime-recycled.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 crsc-action-player_pause.svgz cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr64-filesys-folder_orange_open.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 crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr128-filesys-network_local.png cr32-action-make_kdevelop.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr32-mime-source_s.png cr16-filesys-folder_video.png crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.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 cr16-action-music_fullnote.png cr128-filesys-folder_video.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 cr32-action-view_tree.png cr64-device-hdd_mount.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 cr128-mime-document2.png cr32-device-compact_flash_unmount.png cr32-action-indent.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 cr16-action-kde5.png cr32-action-top.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr16-action-contents.png cr128-filesys-folder_favorite.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 cr22-action-goto.png crsc-mime-image.svgz 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 cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr32-action-switchuser.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-app-kmenu.png cr32-action-text_left.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 cr16-filesys-desktop.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-action-player_rew.svgz crsc-filesys-folder_sound.svgz cr16-action-wizard.png cr128-filesys-file_broken.png 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 cr48-device-chardevice.png cr32-mime-vcard.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz crsc-action-exit.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 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 cr64-mime-source_h.png cr22-mime-source_s.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 cr32-action-edittrash.png cr22-action-unlock.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 cr32-filesys-folder.png crsc-device-mo_umount.svgz cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr32-device-joystick.png cr16-action-cancel.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 cr128-device-compact_flash_mount.png cr32-action-view_icon.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr128-mime-widget_doc.png cr64-filesys-folder_yellow_open.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 cr64-mime-source_j.png cr22-mime-kexi_kexi.png cr22-mime-source_c.png crsc-filesys-file_locked.svgz cr16-filesys-folder_home.png cr32-action-help.png 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 cr22-action-gear.png cr48-action-filenew.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-3floppy_unmount.png cr64-device-ipod_mount.png cr32-action-view_right.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr32-action-view_multicolumn.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 cr16-action-2leftarrow.png cr48-mime-kivio_flw.png cr48-device-dvd_mount.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png cr16-filesys-folder_orange.png cr32-mime-recycled.png cr48-action-remove.png crsc-filesys-folder_green_open.svgz 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-mime-mozilla_doc.png crsc-action-previous.svgz cr64-device-5floppy_unmount.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 cr22-filesys-folder_green.png cr128-filesys-folder_print.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-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr32-mime-zip.png cr128-app-kmenu.png cr48-device-camera_unmount.png cr128-filesys-lock_overlay.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr32-mime-deb.png cr16-mime-quicktime.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_txt.png cr48-filesys-folder_home.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr48-filesys-folder_outbox.png cr32-mime-file_locked.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.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 cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr64-mime-source_f.png cr128-mime-source_o.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr48-action-forward.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 cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png crsc-mime-source_py.svgz cr16-action-view_tree.png 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 cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz 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 cr128-filesys-folder_image.png cr22-action-music_flat.png cr22-mime-message.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr64-filesys-folder_favorite.png cr48-mime-deb.png cr32-mime-source_java.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 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-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png crsc-action-share.svgz cr22-action-music_fullnote.png cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr48-action-stop.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.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 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 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 cr32-filesys-folder_open.png cr64-mime-source_s.png cr16-action-ok.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr32-action-previous.png cr22-mime-karbon_karbon.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png 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 cr32-mime-source_f.png cr16-action-contexthelp.png cr16-action-editshred.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr22-mime-vcard.png cr16-mime-widget_doc.png cr22-action-player_pause.png cr48-app-password.png cr128-filesys-pipe.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.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 cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr16-action-tab_new_raised.png cr16-mime-kivio_flw.png cr48-mime-kspread_ksp.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 cr22-action-bottom.png cr48-mime-document.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 cr16-action-view_bottom.png cr16-mime-dvi.png cr64-filesys-folder_home.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png 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 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 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 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-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-pipe.png cr22-action-back.png cr32-filesys-folder_orange.png cr64-device-memory.png cr48-mime-source_j.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 cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.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 cr128-device-print_class.png cr16-filesys-trashcan_empty.png cr64-device-tv.png cr32-action-locationbar_erase.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 crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png 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 cr32-action-text_sub.png cr16-action-music_natur.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.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 cr16-mime-make.png cr22-action-1downarrow.png cr128-mime-cdr.png cr22-action-player_playlist.png cr48-device-mo_unmount.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 cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr32-mime-ascii.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr32-action-fileclose.png cr22-action-misc.png cr22-action-text_under.png crsc-action-player_stop.svgz cr48-device-cdwriter_mount.png cr16-action-view_choose.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_pause.png cr16-action-player_stop.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 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 crsc-action-mail_get.svgz cr48-action-mail_new.png cr48-filesys-folder_red.png crsc-mime-quicktime.svgz 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 crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png 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 cr16-action-kde6.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.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 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 cr128-mime-deb.png crsc-mime-exec_wine.svgz 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 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 cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr16-device-mo_mount.png cr22-action-player_end.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr16-mime-message.png cr32-filesys-folder_yellow_open.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 cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am 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 crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png 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 cr22-action-revert.png cr128-filesys-folder_home.png cr16-device-compact_flash_mount.png cr32-action-compfile.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 cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png crsc-mime-document.svgz cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr16-mime-ascii.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 cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png crsc-mime-source_pl.svgz cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png cr48-action-gohome.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr48-mime-tar.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr48-mime-widget_doc.png cr22-device-usbpendrive_mount.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-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr128-mime-message.png cr22-action-today.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 cr16-mime-source_moc.png cr22-action-window_nofullscreen.png cr16-device-cdrom_mount.png cr48-mime-readme.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 cr32-filesys-lock_overlay.png cr64-mime-source_l.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-gf.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 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 cr32-device-tablet.png cr16-action-1leftarrow.png cr22-action-editshred.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.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 cr22-action-fileclose.png cr22-action-next.png cr32-mime-unknown.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-koffice.png cr48-mime-postscript.png cr16-action-player_rew.png cr16-action-stop.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 cr32-mime-font.png cr64-mime-karbon_karbon.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 cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.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 cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.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 cr48-mime-font_bitmap.png cr22-action-idea.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr16-action-player_playlist.png cr32-mime-core.png cr64-filesys-zip_overlay.png cr16-filesys-folder_open.png cr32-mime-source_cpp.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr16-action-mail_new.png cr48-mime-recycled.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-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 cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr32-action-spellcheck.png cr22-mime-kspread_ksp.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr64-mime-source_cpp.png cr64-device-ipod_unmount.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-mime-core.png cr128-device-hdd_mount.png cr64-device-5floppy_mount.png cr64-device-mo_unmount.png cr64-mime-info.png cr64-filesys-trashcan_empty.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr32-action-text_italic.png cr22-action-folder.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 cr32-mime-image.png crsc-mime-mozilla_doc.svgz 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 cr32-filesys-folder_red.png cr22-action-news_subscribe.png cr32-mime-source_h.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr48-mime-source_java.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 cr32-action-viewmag+.png cr16-device-memory.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 cr22-action-view_sidetree.png cr48-mime-empty.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-top.svgz cr64-mime-metafont.png crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr22-action-math_prod.png cr128-mime-sound.png cr128-device-memory_stick_unmount.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr32-action-editclear.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.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 cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.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-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr22-mime-source.png cr16-filesys-link_overlay.png cr22-action-math_paren.png cr64-device-dvd_unmount.png cr48-device-5floppy_mount.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 cr16-action-switchuser.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr48-device-compact_flash_unmount.png cr128-device-blockdevice.png 
-+KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz 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 cr22-action-player_eject.png cr32-mime-exec_wine.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 cr22-action-window_new.png cr16-action-move.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 cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.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-mime-encrypted.png cr48-action-frameprint.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 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 cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png 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-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.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 cr64-action-player_play.png cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.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 cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.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 cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.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-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png 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 cr16-action-viewmag+.png cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz 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 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 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 cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz 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 cr16-mime-metafont.png crsc-device-mouse.svgz cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.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 crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.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 cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.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 cr22-action-connect_established.png crsc-filesys-file_important.svgz 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 crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr32-action-player_pause.png cr16-mime-tgz.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 cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png 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 cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.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 cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr48-action-eraser.png cr64-mime-pk.png cr16-action-rotate_cw.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 cr22-device-memory_stick_mount.png cr128-mime-encrypted.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-binary.png cr16-mime-txt2.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 cr16-filesys-folder_violet_open.png cr32-action-mail_new.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 cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.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 cr32-action-connect_creating.png cr22-action-player_stop.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 cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.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 cr22-action-run.png cr128-filesys-folder_tar.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.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 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 cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.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 cr22-filesys-www.png crsc-action-add.svgz cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.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 cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png crsc-action-player_pause.svgz cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz 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 cr22-action-colorpicker.png cr32-action-view_fit_height.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.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 cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.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 cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.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-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.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 cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.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 cr22-device-compact_flash_mount.png cr32-device-5floppy_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 cr22-mime-source_java.png crsc-mime-source_java.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-mime-template_source.png cr48-action-colorpicker.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-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr128-filesys-file_broken.png cr16-action-wizard.png 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 cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png 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 cr32-action-edittrash.png cr22-action-unlock.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 cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.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 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 cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.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 crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.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 cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.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 cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.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 cr64-mime-mozilla_doc.png crsc-action-previous.svgz 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 cr22-filesys-folder_green.png cr128-filesys-folder_print.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-action-misc.png cr48-mime-source_p.png cr128-app-kmenu.png crsc-mime-source_h.svgz cr32-mime-zip.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 cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.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-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.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 crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr22-action-remove.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.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-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 cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.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-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 cr32-filesys-folder_important.png cr128-mime-krita_kra.png cr16-action-inline_image.png cr48-action-stop.png cr16-filesys-network_local.png cr64-filesys-file_broken.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 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 cr32-action-text_center.png cr48-device-hdd_mount.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 cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.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_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png 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 cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.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 cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.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 cr22-mime-source_h.png cr48-mime-quicktime.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 cr22-action-crop.png cr128-device-system.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 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 cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png 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 cr22-action-history.png cr64-device-memory_stick_mount.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 cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png 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 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 cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.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 cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.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 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 cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.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 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-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.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 cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.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 cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz crsc-action-player_stop.svgz cr22-action-misc.png cr32-action-fileclose.png cr22-action-text_under.png cr48-device-cdwriter_mount.png cr16-action-view_choose.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 crsc-filesys-folder_man.svgz cr16-mime-txt.png 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 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 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-action-queue.png cr32-mime-rpm.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 crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.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 cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.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 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 cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.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 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 cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.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 cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am 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 cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png 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 cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.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 cr48-mime-misc.png cr22-action-filesave.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 cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr22-action-revert.png cr32-action-compfile.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 cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz 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 cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr128-mime-font_bitmap.png cr32-device-tv.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 cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz 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 cr16-action-run.png cr128-mime-colorscm.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 cr48-mime-tar.png cr32-filesys-exec.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 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 cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.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 cr16-action-pencil.png crsc-action-remove.svgz cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.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 cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.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 cr22-mime-encrypted.png cr16-device-mouse.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.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-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.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-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.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 cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png 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 cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.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 crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.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-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png 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 crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png 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 cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.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-editpaste.png cr22-action-folder.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-mime-image.png crsc-mime-mozilla_doc.svgz 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 cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz 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 cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.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 cr64-mime-metafont.png crsc-action-top.svgz crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.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 cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.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 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 cr22-action-math_paren.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 
+-KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png cr16-action-about_kde.png crsc-mime-zip.svgz cr32-action-mail_post_to.png cr48-action-rotate_ccw.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 cr32-action-messagebox_critical.png crsc-device-zip_unmount.svgz 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 cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr48-device-ipod_unmount.png cr16-action-2rightarrow.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr64-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr16-device-3floppy_mount.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 crsc-mime-source.svgz cr128-filesys-folder_yellow.png 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 cr32-filesys-desktop.png cr16-mime-postscript.png cr16-action-text.png cr32-mime-pdf.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 cr32-action-bookmark_folder.png crsc-action-back.svgz cr22-mime-info.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-player_end.png cr16-action-fileopen.png cr128-app-password.png cr48-mime-source_moc.png cr64-mime-source_php.png cr22-action-encrypted.png cr22-action-make_kdevelop.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-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr128-mime-pdf.png cr22-action-pencil.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-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.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 cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr16-action-lock.png cr22-action-music_halfnote.png cr64-mime-dvi.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-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz 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 cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.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 cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png cr32-mime-txt2.png cr22-action-mail_reply.png crsc-mime-source_s.svgz cr32-device-usbpendrive_mount.png cr128-mime-resource.png cr16-mime-core.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 cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr16-action-viewmag+.png cr16-action-exit.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz 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-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 cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr32-action-bookmarks_list_add.png cr128-mime-exec_wine.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 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 cr16-mime-metafont.png crsc-device-mouse.svgz cr16-action-music_sixteenthnote.png cr22-mime-source_p.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 cr16-filesys-file_broken.png cr22-mime-kchart_chrt.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 cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz 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 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 cr22-filesys-folder_green_open.png cr32-mime-source.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 crsc-filesys-folder_txt.svgz cr16-mime-deb.png cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz 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 cr32-mime-kspread_ksp.png crsc-mime-log.svgz 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-mime-tgz.png cr16-filesys-network.png cr32-action-player_pause.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 cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.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 cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.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 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 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-kchart_chrt.png cr16-mime-txt2.png cr16-mime-binary.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 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 cr22-action-add.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.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-filesys-folder_red_open.png cr22-action-player_stop.png cr32-action-connect_creating.png cr64-mime-colorscm.png crsc-mime-koffice.svgz cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-find.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 cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr32-action-mail_find.png cr128-filesys-network.png cr32-action-view_bottom.png crsc-device-compact_flash_unmount.svgz crsc-mime-message.svgz 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 cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr48-mime-video.png cr22-action-contexthelp.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.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 cr64-mime-kivio_flw.png cr128-mime-karbon_karbon.png cr48-filesys-folder_important.png cr48-filesys-exec.png cr48-filesys-network_local.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 cr64-device-dvd_mount.png cr128-mime-recycled.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 crsc-action-player_pause.svgz cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr64-filesys-folder_orange_open.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 crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr128-filesys-network_local.png cr32-action-make_kdevelop.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr32-mime-source_s.png cr16-filesys-folder_video.png crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.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 cr16-action-music_fullnote.png cr128-filesys-folder_video.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 cr32-action-view_tree.png cr64-device-hdd_mount.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 cr128-mime-document2.png cr32-device-compact_flash_unmount.png cr32-action-indent.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 cr16-action-kde5.png cr32-action-top.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr16-action-contents.png cr128-filesys-folder_favorite.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 cr22-action-goto.png crsc-mime-image.svgz 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 cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr32-action-switchuser.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-app-kmenu.png cr32-action-text_left.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 cr16-filesys-desktop.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-action-player_rew.svgz crsc-filesys-folder_sound.svgz cr16-action-wizard.png cr128-filesys-file_broken.png 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 cr48-device-chardevice.png cr32-mime-vcard.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz crsc-action-exit.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 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 cr64-mime-source_h.png cr22-mime-source_s.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 cr32-action-edittrash.png cr22-action-unlock.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 cr32-filesys-folder.png crsc-device-mo_umount.svgz cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr32-device-joystick.png cr16-action-cancel.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 cr128-device-compact_flash_mount.png cr32-action-view_icon.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr128-mime-widget_doc.png cr64-filesys-folder_yellow_open.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 cr64-mime-source_j.png cr22-mime-kexi_kexi.png cr22-mime-source_c.png crsc-filesys-file_locked.svgz cr16-filesys-folder_home.png cr32-action-help.png 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 cr22-action-gear.png cr48-action-filenew.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-3floppy_unmount.png cr64-device-ipod_mount.png cr32-action-view_right.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr32-action-view_multicolumn.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 cr16-action-2leftarrow.png cr48-mime-kivio_flw.png cr48-device-dvd_mount.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png cr16-filesys-folder_orange.png cr32-mime-recycled.png cr48-action-remove.png crsc-filesys-folder_green_open.svgz 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-mime-mozilla_doc.png crsc-action-previous.svgz cr64-device-5floppy_unmount.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 cr22-filesys-folder_green.png cr128-filesys-folder_print.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-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr32-mime-zip.png cr128-app-kmenu.png cr48-device-camera_unmount.png cr128-filesys-lock_overlay.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr32-mime-deb.png cr16-mime-quicktime.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_txt.png cr48-filesys-folder_home.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr48-filesys-folder_outbox.png cr32-mime-file_locked.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.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 cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr64-mime-source_f.png cr128-mime-source_o.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr48-action-forward.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 cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png crsc-mime-source_py.svgz cr16-action-view_tree.png 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 cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz 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 cr128-filesys-folder_image.png cr22-action-music_flat.png cr22-mime-message.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr64-filesys-folder_favorite.png cr48-mime-deb.png cr32-mime-source_java.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 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-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png crsc-action-share.svgz cr22-action-music_fullnote.png cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr48-action-stop.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.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 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 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 cr32-filesys-folder_open.png cr64-mime-source_s.png cr16-action-ok.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.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 cr32-action-previous.png cr22-mime-karbon_karbon.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png 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 cr32-mime-source_f.png cr16-action-contexthelp.png cr16-action-editshred.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr22-mime-vcard.png cr16-mime-widget_doc.png cr22-action-player_pause.png cr48-app-password.png cr128-filesys-pipe.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.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 cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr16-action-tab_new_raised.png cr16-mime-kivio_flw.png cr48-mime-kspread_ksp.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 cr22-action-bottom.png cr48-mime-document.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 cr16-action-view_bottom.png cr16-mime-dvi.png cr64-filesys-folder_home.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png 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 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 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 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-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-pipe.png cr22-action-back.png cr32-filesys-folder_orange.png cr64-device-memory.png cr48-mime-source_j.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 cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.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 cr128-device-print_class.png cr16-filesys-trashcan_empty.png cr64-device-tv.png cr32-action-locationbar_erase.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 crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png 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 cr32-action-text_sub.png cr16-action-music_natur.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.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 cr16-mime-make.png cr22-action-1downarrow.png cr128-mime-cdr.png cr22-action-player_playlist.png cr48-device-mo_unmount.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 cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr32-mime-ascii.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr32-action-fileclose.png cr22-action-misc.png cr22-action-text_under.png crsc-action-player_stop.svgz cr48-device-cdwriter_mount.png cr16-action-view_choose.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_pause.png cr16-action-player_stop.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 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 cr48-filesys-folder_red.png crsc-mime-quicktime.svgz 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 crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png 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 cr16-action-kde6.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.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 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 cr128-mime-deb.png crsc-mime-exec_wine.svgz 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 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 cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr16-device-mo_mount.png cr22-action-player_end.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr16-mime-message.png cr32-filesys-folder_yellow_open.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 cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am 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 crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png 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 cr22-action-revert.png cr128-filesys-folder_home.png cr16-device-compact_flash_mount.png cr32-action-compfile.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 cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png crsc-mime-document.svgz cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr16-mime-ascii.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 cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png crsc-mime-source_pl.svgz cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png cr48-action-gohome.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr48-mime-tar.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr48-mime-widget_doc.png cr22-device-usbpendrive_mount.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-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr128-mime-message.png cr22-action-today.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 cr16-mime-source_moc.png cr22-action-window_nofullscreen.png cr16-device-cdrom_mount.png cr48-mime-readme.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 cr32-filesys-lock_overlay.png cr64-mime-source_l.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-gf.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 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 cr32-device-tablet.png cr16-action-1leftarrow.png cr22-action-editshred.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.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 cr22-action-fileclose.png cr22-action-next.png cr32-mime-unknown.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-koffice.png cr48-mime-postscript.png cr16-action-player_rew.png cr16-action-stop.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 cr32-mime-font.png cr64-mime-karbon_karbon.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 cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.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 cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.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 cr48-mime-font_bitmap.png cr22-action-idea.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr16-action-player_playlist.png cr32-mime-core.png cr64-filesys-zip_overlay.png cr16-filesys-folder_open.png cr32-mime-source_cpp.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr16-action-mail_new.png cr48-mime-recycled.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-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 cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr32-action-spellcheck.png cr22-mime-kspread_ksp.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr64-mime-source_cpp.png cr64-device-ipod_unmount.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-mime-core.png cr128-device-hdd_mount.png cr64-device-5floppy_mount.png cr64-device-mo_unmount.png cr64-mime-info.png cr64-filesys-trashcan_empty.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr32-action-text_italic.png cr22-action-folder.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 cr32-mime-image.png crsc-mime-mozilla_doc.svgz 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 cr32-filesys-folder_red.png cr22-action-news_subscribe.png cr32-mime-source_h.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr48-mime-source_java.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 cr32-action-viewmag+.png cr16-device-memory.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 cr22-action-view_sidetree.png cr48-mime-empty.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-top.svgz cr64-mime-metafont.png crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr22-action-math_prod.png cr128-mime-sound.png cr128-device-memory_stick_unmount.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr32-action-editclear.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.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 cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.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-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr22-mime-source.png cr16-filesys-link_overlay.png cr22-action-math_paren.png cr64-device-dvd_unmount.png cr48-device-5floppy_mount.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 cr16-action-switchuser.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr48-device-compact_flash_unmount.png cr128-device-blockdevice.png 
++KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz 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 cr22-action-player_eject.png cr32-mime-exec_wine.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 cr22-action-window_new.png cr16-action-move.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 cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.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-mime-encrypted.png cr48-action-frameprint.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 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 cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png 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-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.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 cr64-action-player_play.png cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.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 cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.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 cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.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-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png 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 cr16-action-viewmag+.png cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz 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 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 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 cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz 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 cr16-mime-metafont.png crsc-device-mouse.svgz cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.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 crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.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 cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.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 cr22-action-connect_established.png crsc-filesys-file_important.svgz 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 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 cr32-action-player_pause.png cr16-mime-tgz.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 cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png 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 cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.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 cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr48-action-eraser.png cr64-mime-pk.png cr16-action-rotate_cw.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 cr22-device-memory_stick_mount.png cr128-mime-encrypted.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-binary.png cr16-mime-txt2.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 cr16-filesys-folder_violet_open.png cr32-action-mail_new.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 cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.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 cr32-action-connect_creating.png cr22-action-player_stop.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 cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.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 cr22-action-run.png cr128-filesys-folder_tar.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.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 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 cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.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 cr22-filesys-www.png crsc-action-add.svgz cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.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 cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png crsc-action-player_pause.svgz cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz 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 cr22-action-colorpicker.png cr32-action-view_fit_height.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.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 cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.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 cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.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-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.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 cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.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 cr22-device-compact_flash_mount.png cr32-device-5floppy_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 cr22-mime-source_java.png crsc-mime-source_java.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-mime-template_source.png cr48-action-colorpicker.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-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr128-filesys-file_broken.png cr16-action-wizard.png 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 cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png 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 cr32-action-edittrash.png cr22-action-unlock.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 cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.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 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 cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.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 crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.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 cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.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 cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.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 cr64-mime-mozilla_doc.png crsc-action-previous.svgz 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 cr22-filesys-folder_green.png cr128-filesys-folder_print.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-action-misc.png cr48-mime-source_p.png cr128-app-kmenu.png crsc-mime-source_h.svgz cr32-mime-zip.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 cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.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-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.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 crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr22-action-remove.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.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-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 cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.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-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 cr32-filesys-folder_important.png cr128-mime-krita_kra.png 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 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 cr32-action-text_center.png cr48-device-hdd_mount.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 cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.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_favorite.png cr48-filesys-folder_grey_open.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 cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.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 cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.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 cr22-mime-source_h.png cr48-mime-quicktime.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 cr22-action-crop.png cr128-device-system.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 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 cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png 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 cr22-action-history.png cr64-device-memory_stick_mount.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 cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png 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 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 cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.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 cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.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 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 cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.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 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-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.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 cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.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 cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz crsc-action-player_stop.svgz cr22-action-misc.png cr32-action-fileclose.png cr22-action-text_under.png cr48-device-cdwriter_mount.png cr16-action-view_choose.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 crsc-filesys-folder_man.svgz cr16-mime-txt.png 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 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 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-action-queue.png cr32-mime-rpm.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 crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.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 cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.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 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 cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.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 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 cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.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 cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am 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 cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png 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 cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.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 cr48-mime-misc.png cr22-action-filesave.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 cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr22-action-revert.png cr32-action-compfile.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 cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz 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 cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr128-mime-font_bitmap.png cr32-device-tv.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 cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz 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 cr16-action-run.png cr128-mime-colorscm.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 cr48-mime-tar.png cr32-filesys-exec.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 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 cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.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 cr16-action-pencil.png crsc-action-remove.svgz cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.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 cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.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 cr22-mime-encrypted.png cr16-device-mouse.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.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-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.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-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.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 cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png 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 cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.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 crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.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-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png 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 crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png 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 cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.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-editpaste.png cr22-action-folder.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-mime-image.png crsc-mime-mozilla_doc.svgz 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 cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz 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 cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.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 cr64-mime-metafont.png crsc-action-top.svgz crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.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 cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.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 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 cr22-action-math_paren.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:
  
- #>+ 3879
+ #>+ 3885
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
@@ -33103,6 +36585,8 @@
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
 +	$(INSTALL_DATA) $(srcdir)/crsc-action-frameprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
 +	$(INSTALL_DATA) $(srcdir)/crsc-mime-dvi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
++	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
  	$(INSTALL_DATA) $(srcdir)/cr64-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
@@ -33433,7 +36917,77 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_32ndnote.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_open.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
--	$(INSTALL_DATA) $(srcdir)/cr48-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-cdwriter_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-filequickprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-previous.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-colorscm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-postscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
++	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tar.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-print_class.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_unmount.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-text_italic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
@@ -33446,8 +37000,119 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
--	$(INSTALL_DATA) $(srcdir)/cr32-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-services.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-forward.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdimage.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_unmount.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcard.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_pause.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_multicolumn.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.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-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-player_next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-image2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_umount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
@@ -33462,7 +37127,10 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_mount.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey_open.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
@@ -33487,7 +37155,8 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-nfs_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/nfs_unmount.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-tablet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_eightnote.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-resource.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/identity.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/charset.png
@@ -33507,13 +37176,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcalendar.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_unmount.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kword_kwd.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
@@ -33533,20 +37196,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdwriter_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-filequickprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/metafont.png
@@ -33573,30 +37223,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-1leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-player_stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-previous.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-server.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_rsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_formula.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_dottednote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/wizard.png
@@ -33611,14 +37238,71 @@
 -	$(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_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-make.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/make.svgz
--	$(INSTALL_DATA) $(srcdir)/cr22-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-finish.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-dvd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_txt.png
--	$(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)/cr16-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-applix.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-lock_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/www.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
+ 	$(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)/cr22-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
@@ -33639,16 +37323,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmagfit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmagfit.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green_open.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-colorscm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/attach.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_eject.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_unmount.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmark_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
@@ -33692,7 +37367,30 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-pipe.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
@@ -33702,15 +37400,20 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-zip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_type1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-text_bild.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-1downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-postscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr64-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-lock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
@@ -33749,38 +37452,51 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/trashcan_full.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tar.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-signature.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/html.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-print_class.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-services.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/krita_kra.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-forward.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-editpaste.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-reload3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
--	$(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
@@ -33794,7 +37510,41 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.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-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-fileclose.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-trashcan_empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
++	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sent_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
@@ -33814,7 +37564,16 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-window_nofullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
--	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-top.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-sound.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
@@ -33823,58 +37582,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-rpm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-cdimage.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-2leftarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2leftarrow.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/make.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_unmount.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_cpp.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/today.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-back.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/back.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_video.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-news.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/news.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vcard.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contexthelp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_pause.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_multicolumn.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/encrypted.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileexport.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizedown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizedown.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_txt.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-openterm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/openterm.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_icon.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/video.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
@@ -33899,36 +37607,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_new3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_man.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_forward.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/readme.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/quicktime.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-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/share.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_next.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_bitmap.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/unknown.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/network.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-image2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image2.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_umount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_c.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/frameprint.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_f.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-emptytrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/soffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
@@ -33956,7 +37635,36 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-up.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_type1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
@@ -33967,7 +37675,25 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-kchart_chrt.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-player_play.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-player_play.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_f.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_red_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
@@ -33995,52 +37721,19 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/binary.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-about_kde.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/about_kde.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_image.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/next.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/sound.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-up.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_print.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_crystal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_orange_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-image.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_s.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-finish.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fork.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-file_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-text_center.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-deb.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
@@ -34056,7 +37749,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
@@ -34072,7 +37765,27 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-finish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-info.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
++	$(INSTALL_DATA) $(srcdir)/cr128-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-spreadsheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-back.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
@@ -34091,12 +37804,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_reply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_end.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
@@ -34111,84 +37819,13 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-netscape_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-dvd_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-applix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/applix.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-colorize.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-idea.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brace.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-1uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1uparrow.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_block.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_block.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-applix.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/applix.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_int.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-lock_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/lock_overlay.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_super.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kspread_ksp.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/www.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
-+	$(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)/cr32-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-pipe.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-karbon_karbon.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_locked.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_width.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-font_type1.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
@@ -34196,16 +37833,99 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-vcard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-gettext.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
++	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/bookmark.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-kmultiple.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-pdf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
--	$(INSTALL_DATA) $(srcdir)/cr48-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr48-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
--	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_generic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
++	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-share.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_post_to.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
++	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.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-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-kexi_kexi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-text_strike.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-vectorgfx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-lock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
@@ -34262,89 +37982,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/joystick.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-filesave.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-3floppy_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_h.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/empty.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/image.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_j.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/krita_kra.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdimage.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_forward.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_forward.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_l.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_sidetree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_sidetree.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-fileclose.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frameprint.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_outbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-trashcan_empty.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_empty.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/rpm.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_detailed.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmarks_list_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.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)/cr16-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_sent_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-recycled.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-filequickprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filequickprint.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-editdelete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/make.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_cyan_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-top.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-contents2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
@@ -34355,11 +37993,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/scanner.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_send.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-color_fill.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-print_class.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
@@ -34392,84 +38026,30 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/lock_overlay.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/switchuser.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-up.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_important.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
--	$(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmark_folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_post_to3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/zip_overlay.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_detailed.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_detailed.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contexthelp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-color_line.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/core.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/widget_doc.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kspread_ksp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kspread_ksp.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-5floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-player_play.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/exec_wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-exec.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-vcalendar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-txt2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_cpp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-spreadsheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/postscript.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-back.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-mime-kugardata.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-2downarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-music_quarternote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-filesys-www.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
@@ -34485,99 +38065,15 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-back.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
--	$(INSTALL_DATA) $(srcdir)/cr64-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_bottom.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-font_type1.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_type1.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/trashcan_full.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_find.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_find.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-window_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/make.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/bookmark.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileimport.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-kmultiple.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kmultiple.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-player_start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_under.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-compact_flash_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/vectorgfx.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/apply.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/empty.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/remove.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-2uparrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2uparrow.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_32ndnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_32ndnote.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-tv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_generic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_generic.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red_open.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-share.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/share.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_post_to.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_locked.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-3floppy_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/encrypted.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_spreadsheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_image.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.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-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kformula_kfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-toggle_log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-clear_left.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-kexi_kexi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/midi.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-network.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/make_kdevelop.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_strike.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_natur.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-reload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-vectorgfx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vectorgfx.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdimage.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-memory_stick_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/misc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde4.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-lock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-music_fullnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_fullnote.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_pl.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/folder_new.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
@@ -34586,18 +38082,6 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-pda_black.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-dvd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-filter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filter.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-view_choose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_choose.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tar.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-editshred.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_orange_open.png
@@ -35562,7 +39046,6 @@
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
 +	$(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-mime-gf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
@@ -36363,6 +39846,12 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_window.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_height.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_width.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.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-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-switchuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
@@ -36391,7 +39880,12 @@
 +	$(INSTALL_DATA) $(srcdir)/cr22-mime-file_temporary.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/file_temporary.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-action-player_stop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_stop.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_flat.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-action-colorpicker.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr128-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/binary.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
@@ -36420,10 +39914,7 @@
 +	$(INSTALL_DATA) $(srcdir)/cr16-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
 +	$(INSTALL_DATA) $(srcdir)/cr128-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_width.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
--	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-mime-source_y.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-crop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
@@ -36447,82 +39938,7 @@
 +	$(INSTALL_DATA) $(srcdir)/cr32-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-text_italic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_favorite.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_new.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-completion.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_shortcuts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.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-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-netscape_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-filesys-services.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-video.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
--	$(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-fileopen.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
 -
 -uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
@@ -37233,6 +40649,77 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-goto.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
++	$(INSTALL_DATA) $(srcdir)/cr64-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-text_italic.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_favorite.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
++	$(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-mail_new.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/redo.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_txt.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-text_italic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/unlock.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-completion.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/completion.png
++	$(INSTALL_DATA) $(srcdir)/cr32-device-pda_blue.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
++	$(INSTALL_DATA) $(srcdir)/crsc-device-camera_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_unmount.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_f.png
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_green.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_green.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-bookmarks_list_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/spreadsheet.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_fit_height.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_width.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_width.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-configure_shortcuts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_shortcuts.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
++	$(INSTALL_DATA) $(srcdir)/cr128-filesys-pipe.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/pipe.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_icon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-view_multicolumn.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_bold.png
++	$(INSTALL_DATA) $(srcdir)/cr22-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_mount.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-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-netscape_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-music_cleficon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cleficon.png
++	$(INSTALL_DATA) $(srcdir)/cr16-device-mo_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/ftp.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-apply.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/top.png
++	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_html.png
++	$(INSTALL_DATA) $(srcdir)/crsc-filesys-services.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
++	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_tar.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_s.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-rebuild.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rebuild.png
++	$(INSTALL_DATA) $(srcdir)/crsc-mime-video.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/video.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-filesys-zip_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
@@ -37672,6 +41159,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/dvi.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
@@ -37863,14 +41351,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
@@ -37883,37 +41364,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
@@ -37954,6 +41405,45 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filequickprint.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_mount.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_j.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/sound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/previous.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload_all_tabs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bookmark_add.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_right.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_width.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
@@ -38103,6 +41593,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_l.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/up.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_open.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_mount.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editdelete.png
@@ -38756,25 +42247,6 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
@@ -38797,47 +42269,12 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
@@ -38869,9 +42306,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
@@ -38932,7 +42367,13 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
@@ -38975,7 +42416,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
@@ -39011,8 +42452,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
@@ -39020,84 +42460,15 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
@@ -39117,19 +42488,20 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
@@ -39145,7 +42517,22 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
@@ -39170,66 +42557,13 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
@@ -39241,7 +42575,11 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
@@ -39255,97 +42593,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
@@ -39354,11 +42602,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
@@ -39372,101 +42616,50 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
--	-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/16x16/actions/editcut.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
@@ -39478,11 +42671,35 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
@@ -39499,21 +42716,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
@@ -39538,7 +42741,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_top_bottom.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
@@ -39547,16 +42750,20 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
@@ -39631,7 +42838,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
@@ -39656,9 +42863,9 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
@@ -39696,11 +42903,73 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
@@ -39715,14 +42984,104 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tgz.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_duplicate.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
@@ -39740,15 +43099,99 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/system.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/dvd_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/lock_overlay.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
+-	-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/16x16/actions/editcut.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow.png
@@ -39794,15 +43237,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filenew.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_line.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/binary.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_mount.png
@@ -39827,11 +43262,67 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pk.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1uparrow.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/contents2.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_fwd.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileexport.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2uparrow.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_line.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/printer1.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/resource.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_mount.svgz
@@ -39903,6 +43394,50 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_side_panel.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_y.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tex.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_image.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/crop.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_cw.png
@@ -39912,7 +43447,17 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/netscape_doc.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/remove.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_mount.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
@@ -39922,12 +43467,15 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/joystick.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_strike.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/print_class.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt2.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filenew.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_italic.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
@@ -39997,69 +43545,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/launch.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesave.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/back.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_rsup.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/zip.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/quicktime.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_video.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/netscape_doc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kivio_flw.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_py.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/applix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_play.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/colorpicker.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tgz.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/file_broken.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/widget_doc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_image.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/compact_flash_mount.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_32ndnote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tex.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/top.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/signature.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_image.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizeup.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brackets.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/postscript.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kde.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/postscript.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/system.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/server.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/lock_overlay.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_violet_open.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/up.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_mount.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/log.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fullnote.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filequickprint.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/blockdevice.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
@@ -40076,6 +43562,12 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/down.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/contents.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/recycled.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/karbon_karbon.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/about_kde.png
@@ -40499,6 +43991,9 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/fileopen.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/fileopen.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileopen.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png




More information about the pkg-kde-commits mailing list