[Pkg-kde-commits] rev 2269 - trunk/packages/kdenetwork/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Mon Nov 14 12:54:12 UTC 2005


Author: chrsmrtn
Date: 2005-11-14 12:54:02 +0000 (Mon, 14 Nov 2005)
New Revision: 2269

Modified:
   trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Updated buildprep for 3.5-rc1


Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-11-14 09:21:38 UTC (rev 2268)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-11-14 12:54:02 UTC (rev 2269)
@@ -2,7 +2,7 @@
 # vi: ft=diff
 --- acinclude.m4
 +++ acinclude.m4
-@@ -1688,15 +1688,6 @@
+@@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -18,7 +18,7 @@
    fi
    AC_SUBST(KDE_USE_CLOSURE_TRUE)
    AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2138,9 +2129,6 @@
+@@ -2144,9 +2135,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28,10 +28,33 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -3288,39 +3276,39 @@
+@@ -3351,63 +3339,63 @@
  
-   if test "x$GXX" = "xyes"; then
-     kde_have_gcc_visibility=no
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
 -    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
 -    [
 -      kde_have_gcc_visibility=yes
@@ -58,13 +81,37 @@
 -        ]
 -      )
 -
--      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 -        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 -        KDE_CHECK_VISIBILITY_GCC_BUG
 -        HAVE_GCC_VISIBILITY=1
 -        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
 -      fi
 -    ])
+-  fi
++dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl  if test "x$GXX" = "xyes"; then
++dnl    AC_LANG_SAVE
++dnl    AC_LANG_CPLUSPLUS
++dnl    AC_EGREP_CPP(
++dnl       [GCC visibility push],
++dnl       [ #include <exception> 
++dnl       ], 
++dnl    [
++dnl      AC_MSG_RESULT(yes)
++dnl      kde_stdc_visibility_patched=yes ],
++dnl    [ 
++dnl      AC_MSG_RESULT(no)
++dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++dnl                   visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl      kde_stdc_visibility_patched=no ])
++dnl    AC_LANG_RESTORE
++dnl
++dnl    kde_have_gcc_visibility=no
 +dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
 +dnl    [
 +dnl      kde_have_gcc_visibility=yes
@@ -78,11 +125,11 @@
 +dnl
 +dnl          AC_TRY_COMPILE(
 +dnl          [
-+dnl #include <qglobal.h>
-+dnl #if Q_EXPORT - 0 != 0
-+dnl /* if this compiles, then Q_EXPORT is undefined */
-+dnl /* if Q_EXPORT is nonempty, this will break compilation */
-+dnl #endif
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
 +dnl          ], [/* elvis is alive */],
 +dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
 +dnl
@@ -91,25 +138,54 @@
 +dnl        ]
 +dnl      )
 +dnl
-+dnl      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 +dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 +dnl        KDE_CHECK_VISIBILITY_GCC_BUG
 +dnl        HAVE_GCC_VISIBILITY=1
 +dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
 +dnl      fi
 +dnl    ])
++dnl  fi
+ ])
+ 
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+@@ -5907,30 +5895,15 @@
    fi
  ])
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
  
-@@ -5795,6 +5783,7 @@
- ## the same distribution terms that you use for the rest of that program.
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
  
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
  
- 
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5854,7 +5843,7 @@
+@@ -5990,7 +5963,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -118,9 +194,107 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6268,12 +6257,11 @@
+@@ -6040,7 +6013,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -6060,7 +6033,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6108,6 +6081,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -6153,6 +6128,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -6225,15 +6242,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -6402,14 +6419,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
-     case "`/usr/bin/file conftest.o`" in
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
      *32-bit*)
 -      LINUX_64_MODE="32"
        case $host in
@@ -132,7 +306,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6285,7 +6273,6 @@
+@@ -6421,7 +6437,6 @@
        esac
        ;;
      *64-bit*)
@@ -140,7 +314,47 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6415,7 +6402,7 @@
+@@ -6486,7 +6501,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6496,8 +6511,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
+        $2=yes
+      fi
+    fi
+@@ -6523,11 +6540,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -6551,7 +6573,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -149,24 +363,52 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6444,20 +6431,26 @@
+@@ -6580,20 +6602,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-  *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
 -    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
 -	       = "XX$testring") >/dev/null 2>&1 &&
 -	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
  	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -181,7 +423,16 @@
      # 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.
-@@ -6607,7 +6600,7 @@
+@@ -6689,7 +6744,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -6743,7 +6798,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -190,7 +441,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6696,13 +6689,6 @@
+@@ -6832,20 +6887,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -204,12 +455,29 @@
     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.
-@@ -6726,8 +6712,11 @@
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6857,13 +6905,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
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -218,7 +486,18 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6844,7 +6833,7 @@
+@@ -6922,8 +6975,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -6980,7 +7033,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -227,7 +506,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6857,7 +6846,7 @@
+@@ -6993,7 +7046,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -236,7 +515,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6867,7 +6856,20 @@
+@@ -7003,7 +7056,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +537,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6932,7 +6934,7 @@
+@@ -7068,7 +7134,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,8 +546,17 @@
    ;;
  
  beos*)
-@@ -6957,7 +6959,7 @@
+@@ -7077,7 +7143,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7093,7 +7159,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -276,34 +564,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7022,7 +7024,7 @@
+@@ -7105,7 +7171,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -7135,7 +7202,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -7158,7 +7225,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7045,7 +7047,7 @@
+@@ -7181,7 +7248,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7105,7 +7107,7 @@
+@@ -7193,8 +7260,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -7212,7 +7288,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -7239,9 +7315,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7120,7 +7122,7 @@
+@@ -7256,7 +7332,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -312,7 +651,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7131,7 +7133,7 @@
+@@ -7267,7 +7343,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -321,7 +660,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7193,22 +7195,19 @@
+@@ -7329,22 +7405,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -343,14 +682,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7218,6 +7217,30 @@
+@@ -7354,6 +7427,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -381,7 +720,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7227,7 +7250,7 @@
+@@ -7363,7 +7460,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -390,16 +729,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7256,7 +7279,7 @@
+@@ -7392,7 +7489,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7276,7 +7299,7 @@
+@@ -7412,7 +7513,7 @@
  
  os2*)
    libname_spec='$name'
@@ -408,9 +751,80 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7867,31 +7890,23 @@
+@@ -7558,7 +7659,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -7620,7 +7723,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -7794,7 +7897,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -7904,7 +8007,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -7936,7 +8039,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -7963,6 +8066,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'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -7996,44 +8108,36 @@
+   lt_cv_deplibs_check_method=pass_all
    ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
  cygwin*)
 -  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
@@ -444,12 +858,28 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7930,42 +7945,21 @@
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -8049,7 +8153,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -8066,42 +8170,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -499,9 +929,21 @@
    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
-@@ -7994,9 +7988,6 @@
+@@ -8120,19 +8203,14 @@
    ;;
  
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
  osf3* | osf4* | osf5*)
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -509,7 +951,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8006,7 +7997,6 @@
+@@ -8142,7 +8220,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -517,7 +959,83 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8272,7 +8262,7 @@
+@@ -8250,13 +8327,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -8275,13 +8352,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -8319,10 +8396,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -8395,6 +8483,10 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -8408,7 +8500,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])
@@ -526,7 +1044,16 @@
    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
-@@ -8322,7 +8312,7 @@
+@@ -8449,7 +8541,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -8458,48 +8550,11 @@
    fi
    ;;
  
@@ -535,62 +1062,87 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8332,29 +8322,29 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-       fi
-       ;;
-     esac
-     output_verbose_link_cmd='echo'
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
 -    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     _LT_AC_TAGVAR(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8362,8 +8352,8 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-   else
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -  fi  
 -    ;;  
-+  fi
 +    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8471,8 +8461,8 @@
+@@ -8524,7 +8579,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -8553,7 +8608,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8568,6 +8623,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -8589,7 +8648,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -8607,8 +8666,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
@@ -601,7 +1153,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8498,7 +8488,7 @@
+@@ -8634,7 +8693,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.
@@ -610,7 +1162,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8528,8 +8518,22 @@
+@@ -8664,8 +8723,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -635,7 +1187,26 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8575,15 +8579,16 @@
+@@ -8682,7 +8755,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -8703,6 +8776,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -8711,15 +8787,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +1227,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.
-@@ -8592,13 +8597,12 @@
+@@ -8728,13 +8805,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -672,16 +1243,23 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8613,7 +8617,7 @@
+@@ -8748,8 +8824,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	# 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'
        fi
      fi
      ;;
-@@ -8630,12 +8634,12 @@
+@@ -8762,16 +8838,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
      # _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'
@@ -696,7 +1274,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8644,7 +8648,7 @@
+@@ -8780,70 +8857,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -705,87 +1283,170 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8655,20 +8659,20 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
        fi
-       ;;
-     esac
-@@ -8678,19 +8682,19 @@
-       lt_int_apple_cc_single_mod=yes
-     fi
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     else
+-    else
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- 
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
+-    else
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     _LT_AC_TAGVAR(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8725,7 +8729,7 @@
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8854,14 +8942,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8747,7 +8751,7 @@
+@@ -8878,12 +8966,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
-     aCC)
+-    aCC)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8756,11 +8760,11 @@
+@@ -8892,11 +8980,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
@@ -794,7 +1455,38 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8817,7 +8821,7 @@
+@@ -8906,7 +8994,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -8922,7 +9010,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -8943,17 +9031,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -803,7 +1495,13 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8838,7 +8842,7 @@
+@@ -8969,12 +9057,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -812,28 +1510,38 @@
  	      ;;
  	    esac
  	  fi
-@@ -8853,7 +8857,7 @@
+@@ -8987,9 +9075,9 @@
+     ;;
+   irix5* | irix6*)
      case $cc_basename in
-       CC)
+-      CC)
++      CC*)
  	# SGI C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8864,9 +8868,9 @@
+@@ -9000,9 +9088,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  	  else
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8883,8 +8887,8 @@
+@@ -9013,14 +9101,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -844,19 +1552,49 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8906,16 +8910,16 @@
+@@ -9038,20 +9126,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
  	# Intel C++
  	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
-       cxx)
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
  	# Compaq C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -865,8 +1603,17 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8953,7 +8957,7 @@
+@@ -9079,7 +9191,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
+@@ -9089,7 +9201,7 @@
+ 	;;
      esac
      ;;
 -  netbsd*)
@@ -874,7 +1621,32 @@
      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=
-@@ -8972,7 +8976,7 @@
+@@ -9100,15 +9212,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -883,25 +1655,41 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8989,7 +8993,7 @@
+@@ -9118,14 +9246,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9143,7 +9271,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9032,7 +9036,7 @@
+@@ -9162,13 +9290,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -910,50 +1698,123 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9048,10 +9052,10 @@
+@@ -9177,17 +9305,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
  	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9070,7 +9074,7 @@
+@@ -9206,7 +9334,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9127,9 +9131,9 @@
-       CC)
+@@ -9230,7 +9358,7 @@
+   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
+ 	;;
+@@ -9242,12 +9370,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9260,36 +9388,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
  	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9163,7 +9167,7 @@
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -9297,9 +9422,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
-       gcx)
+-      gcx)
++      gcx*)
  	# Green Hills C++ Compiler
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9173,9 +9177,9 @@
+@@ -9309,9 +9434,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
@@ -965,7 +1826,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9184,9 +9188,9 @@
+@@ -9320,9 +9445,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -977,7 +1838,25 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9354,7 +9358,7 @@
+@@ -9340,7 +9465,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9450,7 +9575,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -9490,7 +9615,7 @@
         fi
         ;;
  
@@ -986,16 +1865,115 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9463,7 +9467,7 @@
+@@ -9526,6 +9651,21 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -9576,12 +9716,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9591,7 +9735,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -9599,8 +9743,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
    ;;
  esac
-@@ -9605,11 +9609,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -9651,20 +9797,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -9711,11 +9864,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -9741,11 +9899,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1010,7 +1988,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9659,7 +9664,7 @@
+@@ -9795,7 +9954,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1997,34 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9790,7 +9795,7 @@
+@@ -9861,11 +10020,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -9896,6 +10055,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -9926,7 +10091,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1028,7 +2033,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9821,7 +9826,7 @@
+@@ -9957,7 +10122,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1037,7 +2042,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10065,7 +10070,10 @@
+@@ -9972,7 +10137,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -10201,7 +10366,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.
@@ -1049,7 +2063,31 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10138,7 +10146,7 @@
+@@ -10243,9 +10411,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -10267,6 +10432,13 @@
+   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*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+@@ -10274,7 +10446,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1058,7 +2096,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10156,7 +10164,7 @@
+@@ -10292,14 +10464,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1067,26 +2105,133 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10371,7 +10379,7 @@
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -10463,7 +10638,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -10488,18 +10663,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10507,22 +10692,22 @@
+ 	    ;;
  	esac
  	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10422,7 +10430,7 @@
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -10537,7 +10722,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -10548,18 +10733,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 -	    ;; 
+-	  cxx)
 +	    ;;
- 	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10447,7 +10455,7 @@
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -10576,25 +10767,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
  	    ;;
+ 	  *)
+ 	    ;;
  	esac
  	;;
 -      netbsd*)
@@ -1094,17 +2239,175 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10758,6 +10766,9 @@
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -10610,7 +10801,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -10619,13 +10810,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -10635,12 +10826,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10650,7 +10841,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -10721,7 +10912,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10747,6 +10938,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -10758,7 +10959,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10782,12 +10983,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -10808,9 +11016,14 @@
+       ;;
+ 
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -10832,6 +11045,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10859,7 +11077,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -10892,7 +11110,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 '\''/^[[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*)
 +    _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'
-   ;;
-@@ -10782,7 +10793,7 @@
+@@ -10918,7 +11139,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +2416,45 @@
    _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*
-@@ -10856,7 +10867,7 @@
+@@ -10935,7 +11156,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -10955,6 +11177,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -10992,7 +11235,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
@@ -1122,7 +2463,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10866,13 +10877,13 @@
+@@ -11002,13 +11245,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'
@@ -1130,7 +2471,8 @@
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        _LT_AC_TAGVAR(always_export_symbols, $1)=no
        _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1138,18 +2480,51 @@
  	# 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
-@@ -10881,19 +10892,19 @@
+@@ -11017,19 +11260,51 @@
  	  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'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
 -    netbsd*)
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-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'
@@ -1162,7 +2537,7 @@
        fi
        ;;
  
-@@ -10911,8 +10922,8 @@
+@@ -11047,8 +11322,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,36 +2548,8 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10925,10 +10936,36 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
+@@ -11063,24 +11338,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+      fi
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+    ;;
-+
      *)
        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'
@@ -1212,7 +2559,28 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10978,9 +11015,20 @@
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -11114,9 +11384,20 @@
  	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
@@ -1235,7 +2603,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11026,29 +11074,29 @@
+@@ -11133,7 +11414,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -11154,6 +11435,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -11162,29 +11446,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1274,16 +2661,27 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11063,7 +11111,7 @@
+@@ -11198,8 +11482,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # 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'
  	fi
        fi
        ;;
-@@ -11086,13 +11134,13 @@
+@@ -11212,7 +11496,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -11222,69 +11506,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,88 +2698,117 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -11106,21 +11154,21 @@
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       case "$host_os" in
-       rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.[012])
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -11129,26 +11177,26 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 -    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi  
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
 +    fi
        ;;
  
      dgux*)
-@@ -11181,8 +11229,8 @@
+@@ -11317,8 +11601,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | 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
-@@ -11190,7 +11238,7 @@
+@@ -11326,7 +11610,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1390,9 +2817,12 @@
        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
-@@ -11208,10 +11256,10 @@
+@@ -11342,16 +11626,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	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 ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1403,7 +2833,21 @@
  	  ;;
  	esac
        else
-@@ -11258,7 +11306,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -11361,7 +11645,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -11394,7 +11678,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1412,7 +2856,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11268,7 +11316,7 @@
+@@ -11404,7 +11688,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1421,16 +2865,17 @@
        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
-@@ -11291,7 +11339,7 @@
+@@ -11427,7 +11711,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11301,7 +11349,7 @@
+@@ -11437,7 +11722,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1439,7 +2884,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11312,14 +11360,14 @@
+@@ -11448,14 +11733,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
@@ -1456,7 +2901,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'
-@@ -11331,7 +11379,7 @@
+@@ -11467,13 +11752,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}\*'
@@ -1465,19 +2910,50 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11356,9 +11404,9 @@
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -11492,10 +11777,12 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11378,7 +11426,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -11504,8 +11791,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -11514,7 +11811,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.
@@ -1486,7 +2962,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11438,9 +11486,9 @@
+@@ -11574,9 +11871,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1498,7 +2974,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11498,7 +11546,7 @@
+@@ -11634,7 +11931,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,16 +2983,15 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11657,8 +11705,8 @@
-     fi
-   done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
- 
+@@ -11768,7 +12065,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 --- aclocal.m4
 +++ aclocal.m4
 @@ -501,6 +501,35 @@
@@ -1557,7 +3032,7 @@
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- config.h.in
 +++ config.h.in
-@@ -505,9 +505,6 @@
+@@ -511,9 +511,6 @@
  #endif
  
  
@@ -1569,12 +3044,31 @@
  #define __svr4__ 1
 --- configure
 +++ configure
+@@ -278,15 +278,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_SLP GLINC GLLIB include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS PKG_CONFIG MEANWHILE_CFLAGS MEANWHILE_LIBS GLIB_CFLAGS GLIB_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE include_msn_webcam_TRUE include_msn_webcam_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_SLP GLINC GLLIB include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS PKG_CONFIG MEANWHILE_CFLAGS MEANWHILE_LIBS GLIB_CFLAGS GLIB_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE include_msn_webcam_TRUE include_msn_webcam_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -1587,7 +3081,7 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1194,7 +1196,7 @@
+@@ -1199,7 +1201,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -1596,10 +3090,19 @@
    done
  fi
  
-@@ -2097,6 +2099,31 @@
+@@ -1971,7 +1973,7 @@
  
  
+ # Define the identity of the package.
+- PACKAGE=kdenetwork
++ PACKAGE=kdenetwork-rc1
+  VERSION="3.5"
  
+ 
+@@ -2102,6 +2104,31 @@
+ 
+ 
+ 
 +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
 +    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -1628,7 +3131,7 @@
  
    unset CDPATH
  
-@@ -3030,8 +3057,7 @@
+@@ -3035,8 +3062,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1638,7 +3141,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3089,8 +3115,7 @@
+@@ -3094,8 +3120,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1648,7 +3151,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3206,8 +3231,7 @@
+@@ -3211,8 +3236,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1658,7 +3161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3261,8 +3285,7 @@
+@@ -3266,8 +3290,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1668,7 +3171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3307,8 +3330,7 @@
+@@ -3312,8 +3335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1678,7 +3181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3352,8 +3374,7 @@
+@@ -3357,8 +3379,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1688,7 +3191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3910,8 +3931,7 @@
+@@ -3915,8 +3936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1698,7 +3201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3969,8 +3989,7 @@
+@@ -3974,8 +3994,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1708,7 +3211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4041,8 +4060,7 @@
+@@ -4046,8 +4065,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1718,7 +3221,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4086,8 +4104,7 @@
+@@ -4091,8 +4109,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1728,7 +3231,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4265,8 +4282,7 @@
+@@ -4270,8 +4287,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1738,7 +3241,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4377,8 +4393,7 @@
+@@ -4382,8 +4398,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1748,7 +3251,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4466,8 +4481,7 @@
+@@ -4471,8 +4486,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1758,7 +3261,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4569,8 +4583,7 @@
+@@ -4574,8 +4588,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1768,7 +3271,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4669,8 +4682,7 @@
+@@ -4674,8 +4687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1778,7 +3281,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4754,8 +4766,7 @@
+@@ -4759,8 +4771,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1788,7 +3291,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4844,8 +4855,7 @@
+@@ -4849,8 +4860,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1798,7 +3301,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4932,8 +4942,7 @@
+@@ -4937,8 +4947,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1808,7 +3311,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5020,8 +5029,7 @@
+@@ -5025,8 +5034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1818,7 +3321,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5127,8 +5135,7 @@
+@@ -5132,8 +5140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1828,7 +3331,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5215,8 +5222,7 @@
+@@ -5220,8 +5227,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1838,7 +3341,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5303,8 +5309,7 @@
+@@ -5308,8 +5314,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1848,7 +3351,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5391,8 +5396,7 @@
+@@ -5396,8 +5401,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1858,7 +3361,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5523,8 +5527,7 @@
+@@ -5528,8 +5532,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1868,7 +3371,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5612,8 +5615,7 @@
+@@ -5617,8 +5620,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1878,7 +3381,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5700,8 +5702,7 @@
+@@ -5705,8 +5707,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1888,7 +3391,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5788,8 +5789,7 @@
+@@ -5793,8 +5794,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1898,7 +3401,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5876,8 +5876,7 @@
+@@ -5881,8 +5881,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1908,7 +3411,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5964,8 +5963,7 @@
+@@ -5969,8 +5968,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1918,7 +3421,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6388,8 +6386,7 @@
+@@ -6393,8 +6391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1928,7 +3431,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6515,8 +6512,7 @@
+@@ -6520,8 +6517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1938,7 +3441,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6604,8 +6600,7 @@
+@@ -6609,8 +6605,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1948,7 +3451,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6688,185 +6683,6 @@
+@@ -6693,185 +6688,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -2134,19 +3637,58 @@
    fi
  
  
-@@ -7055,10 +6871,10 @@
-     fi
-   done
- done
-+SED=$lt_cv_path_SED
+@@ -7035,7 +6851,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -7140,7 +6956,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -7174,7 +6990,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -7204,6 +7020,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'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
  
- fi
+ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+@@ -7290,44 +7115,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -7292,31 +7108,23 @@
+-bsdi4*)
++bsdi[45]*)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
    ;;
  
  cygwin*)
@@ -2181,12 +3723,28 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7355,42 +7163,21 @@
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -7343,7 +7160,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -7360,42 +7177,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -2236,9 +3794,21 @@
    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
-@@ -7419,9 +7206,6 @@
+@@ -7414,19 +7210,14 @@
    ;;
  
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   fi
+   ;;
+ 
  osf3* | osf4* | osf5*)
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -2246,7 +3816,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7431,7 +7215,6 @@
+@@ -7436,7 +7227,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -2254,18 +3824,21 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7508,7 +7291,7 @@
+@@ -7513,7 +7303,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7511 "configure"' > conftest.$ac_ext
-+  echo '#line 7294 "configure"' > conftest.$ac_ext
+-  echo '#line 7516 "configure"' > conftest.$ac_ext
++  echo '#line 7306 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7553,12 +7336,11 @@
+@@ -7556,14 +7346,13 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-     case "`/usr/bin/file conftest.o`" in
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
      *32-bit*)
 -      LINUX_64_MODE="32"
        case $host in
@@ -2277,7 +3850,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7570,7 +7352,6 @@
+@@ -7575,7 +7364,6 @@
        esac
        ;;
      *64-bit*)
@@ -2285,7 +3858,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7630,8 +7411,7 @@
+@@ -7635,8 +7423,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2295,7 +3868,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7706,8 +7486,7 @@
+@@ -7711,8 +7498,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2305,7 +3878,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7877,8 +7656,7 @@
+@@ -7882,8 +7668,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2315,7 +3888,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7945,8 +7723,7 @@
+@@ -7950,8 +7735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2325,16 +3898,260 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8153,7 +7930,7 @@
+@@ -8066,6 +7850,243 @@
  
+ done
  
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=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
++echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++if test -z "$CXXCPP"; then
++  if test "${ac_cv_prog_CXXCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (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
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (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
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (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
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (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
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=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
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -8158,7 +8179,7 @@
+ 
+ 
  # Provide some information about the compiler.
--echo "$as_me:8156:" \
-+echo "$as_me:7933:" \
+-echo "$as_me:8161:" \
++echo "$as_me:8182:" \
       "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
-@@ -8199,8 +7976,7 @@
+@@ -8204,8 +8225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2344,7 +4161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8249,8 +8025,7 @@
+@@ -8254,8 +8274,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2354,7 +4171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8308,7 +8083,7 @@
+@@ -8313,7 +8332,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -2363,24 +4180,52 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8337,20 +8112,26 @@
+@@ -8342,20 +8361,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-  *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
 -    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
 -	       = "XX$testring") >/dev/null 2>&1 &&
 -	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
  	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -2395,7 +4240,31 @@
      # 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.
-@@ -8418,7 +8199,7 @@
+@@ -8392,9 +8444,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -8416,6 +8465,13 @@
+   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*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[BCDEGRST]'
+   ;;
+@@ -8423,7 +8479,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -2404,7 +4273,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8436,7 +8217,7 @@
+@@ -8441,14 +8497,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2413,35 +4282,256 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -9185,11 +8966,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -8610,7 +8669,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+@@ -8630,7 +8689,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8915,6 +8974,17 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -8940,7 +9010,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9002,7 +9072,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9101,6 +9171,20 @@
+ 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
++_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
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -9137,11 +9221,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
+@@ -9187,18 +9276,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9188: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8969: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9193: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9282: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9192: \$? = $ac_status" >&5
-+   echo "$as_me:8973: \$? = $ac_status" >&5
+-   echo "$as_me:9197: \$? = $ac_status" >&5
++   echo "$as_me:9286: \$? = $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
-@@ -9418,11 +9199,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-     # 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
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -9275,7 +9366,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9301,6 +9392,16 @@
+ 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -9312,7 +9413,7 @@
+       lt_prog_compiler_wl='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9336,12 +9437,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+ 	lt_prog_compiler_pic='-KPIC'
+ 	lt_prog_compiler_static='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl='-Wl,'
+         # All Alpha code is PIC.
+@@ -9362,9 +9470,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -9386,6 +9499,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic='-pic'
+       lt_prog_compiler_static='-Bstatic'
+@@ -9420,18 +9538,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9421: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9202: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9426: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9544: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9425: \$? = $ac_status" >&5
-+   echo "$as_me:9206: \$? = $ac_status" >&5
+-   echo "$as_me:9430: \$? = $ac_status" >&5
++   echo "$as_me:9548: \$? = $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
-@@ -9469,13 +9250,6 @@
+-     # 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
+        lt_prog_compiler_pic_works=yes
+      fi
+    fi
+@@ -9452,7 +9572,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic=
+@@ -9474,38 +9594,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -2455,26 +4545,35 @@
     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.
-@@ -9485,11 +9259,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9262: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9606: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9492: \$? = $ac_status" >&5
-+   echo "$as_me:9266: \$? = $ac_status" >&5
+-   echo "$as_me:9497: \$? = $ac_status" >&5
++   echo "$as_me:9610: \$? = $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
-@@ -9499,8 +9273,11 @@
+      # 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
+        lt_cv_prog_compiler_c_o=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -2483,7 +4582,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9628,7 +9405,7 @@
+@@ -9576,6 +9694,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -9596,6 +9724,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -9633,7 +9782,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -2492,7 +4636,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9638,13 +9415,13 @@
+@@ -9643,13 +9792,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'
@@ -2500,7 +4644,8 @@
 +      allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
-       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -2508,7 +4653,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9653,19 +9430,19 @@
+@@ -9658,19 +9807,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -2520,6 +4665,38 @@
        ;;
  
 -    netbsd*)
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs=no
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2532,7 +4709,7 @@
        fi
        ;;
  
-@@ -9683,8 +9460,8 @@
+@@ -9688,8 +9869,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2543,36 +4720,8 @@
        else
  	ld_shlibs=no
        fi
-@@ -9697,10 +9474,36 @@
-       hardcode_shlibpath_var=no
-       ;;
+@@ -9704,24 +9885,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs=no
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
      *)
        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'
@@ -2582,7 +4731,28 @@
        else
  	ld_shlibs=no
        fi
-@@ -9750,9 +9553,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-      fi
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9755,9 +9931,20 @@
  	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
@@ -2605,7 +4775,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9798,21 +9612,22 @@
+@@ -9774,7 +9961,7 @@
+       link_all_deplibs=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -9795,6 +9982,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -9803,21 +9993,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -2633,7 +4822,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9836,8 +9651,7 @@
+@@ -9841,8 +10032,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2643,7 +4832,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9864,14 +9678,13 @@
+@@ -9869,14 +10059,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -2661,7 +4850,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9898,8 +9711,7 @@
+@@ -9903,8 +10092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2671,16 +4860,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9937,7 +9749,7 @@
+@@ -9941,8 +10129,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # 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'
  	fi
        fi
        ;;
-@@ -9960,13 +9772,13 @@
+@@ -9955,7 +10143,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+@@ -9965,13 +10153,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -2697,14 +4897,17 @@
        # 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.
-@@ -9980,21 +9792,21 @@
-       archive_cmds_need_lc=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+@@ -9981,52 +10169,52 @@
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
@@ -2717,58 +4920,88 @@
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -10003,18 +9815,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc=no
        hardcode_direct=no
        hardcode_automatic=yes
        hardcode_shlibpath_var=unsupported
-@@ -10055,8 +9867,8 @@
+-      whole_archive_flag_spec='-all_load $convenience'
++      whole_archive_flag_spec=''
+       link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -10060,8 +10248,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10064,7 +9876,7 @@
+@@ -10069,7 +10257,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -2777,9 +5010,12 @@
        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
-@@ -10082,10 +9894,10 @@
+@@ -10085,16 +10273,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	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 ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -2790,7 +5026,21 @@
  	  ;;
  	esac
        else
-@@ -10132,7 +9944,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -10104,7 +10292,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld='+b $libdir'
+@@ -10137,7 +10325,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -2799,7 +5049,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10142,7 +9954,7 @@
+@@ -10147,7 +10335,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -2808,16 +5058,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10165,7 +9977,7 @@
+@@ -10170,7 +10358,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10175,7 +9987,7 @@
+@@ -10180,7 +10369,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -2826,7 +5077,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10186,14 +9998,14 @@
+@@ -10191,14 +10380,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -2843,7 +5094,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'
-@@ -10205,7 +10017,7 @@
+@@ -10210,13 +10399,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -2852,19 +5103,50 @@
  	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag=' -expect_unresolved \*'
-@@ -10230,9 +10042,9 @@
+ 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10235,10 +10424,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10252,7 +10064,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10247,8 +10438,18 @@
+       hardcode_shlibpath_var=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -10257,7 +10458,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.
@@ -2873,7 +5155,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10312,9 +10124,9 @@
+@@ -10317,9 +10518,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -2885,7 +5167,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10420,7 +10232,7 @@
+@@ -10425,7 +10626,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -2894,7 +5176,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10430,7 +10242,20 @@
+@@ -10435,7 +10636,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2916,7 +5198,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10495,7 +10320,7 @@
+@@ -10500,7 +10714,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -2925,8 +5207,17 @@
    ;;
  
  beos*)
-@@ -10520,7 +10345,7 @@
+@@ -10509,7 +10723,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10525,7 +10739,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -2934,34 +5225,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10585,7 +10410,7 @@
+@@ -10537,7 +10751,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -10567,7 +10782,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -10590,7 +10805,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10608,7 +10433,7 @@
+@@ -10613,7 +10828,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10668,7 +10493,7 @@
+@@ -10625,8 +10840,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -10644,7 +10868,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -10671,9 +10895,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10683,7 +10508,7 @@
+@@ -10688,7 +10912,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -2970,7 +5312,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10694,7 +10519,7 @@
+@@ -10699,7 +10923,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -2979,7 +5321,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10756,22 +10581,19 @@
+@@ -10761,22 +10985,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -3001,14 +5343,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10781,6 +10603,30 @@
+@@ -10786,6 +11007,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -3039,7 +5381,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10790,7 +10636,7 @@
+@@ -10795,7 +11040,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -3048,16 +5390,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10819,7 +10665,7 @@
+@@ -10824,7 +11069,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -10839,7 +10685,7 @@
+@@ -10844,7 +11093,7 @@
  
  os2*)
    libname_spec='$name'
@@ -3066,7 +5412,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11068,8 +10914,7 @@
+@@ -10946,8 +11195,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct" != no &&
+@@ -11073,8 +11322,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3076,7 +5433,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11172,8 +11017,7 @@
+@@ -11177,8 +11425,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3086,7 +5443,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11238,8 +11082,7 @@
+@@ -11243,8 +11490,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3096,7 +5453,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11332,8 +11175,7 @@
+@@ -11337,8 +11583,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3106,7 +5463,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11398,8 +11240,7 @@
+@@ -11403,8 +11648,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3116,7 +5473,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11465,8 +11306,7 @@
+@@ -11470,8 +11714,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3126,7 +5483,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11532,8 +11372,7 @@
+@@ -11537,8 +11780,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3136,25 +5493,52 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11608,7 +11447,7 @@
+@@ -11613,7 +11855,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11611 "configure"
-+#line 11450 "configure"
+-#line 11616 "configure"
++#line 11858 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11706,7 +11545,7 @@
+@@ -11679,7 +11921,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 ;;
+@@ -11711,7 +11953,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11709 "configure"
-+#line 11548 "configure"
+-#line 11714 "configure"
++#line 11956 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11831,7 +11670,7 @@
+@@ -11777,7 +12019,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 ;;
+@@ -11827,7 +12069,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -11836,47 +12078,10 @@
    fi
    ;;
  
@@ -3163,18 +5547,18 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -11841,29 +11680,29 @@
-     archive_cmds_need_lc=no
-     case "$host_os" in
-     rhapsody* | darwin1.[012])
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
 -      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+      allow_undefined_flag='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-       else
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.012)
 -	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -3183,31 +5567,27 @@
 -	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-       fi
-       ;;
-     esac
-     output_verbose_link_cmd='echo'
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
 -    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     hardcode_direct=no
-     hardcode_automatic=yes
-     hardcode_shlibpath_var=unsupported
-@@ -11897,7 +11736,8 @@
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
+-  else
+-    ld_shlibs=no
+-  fi
+     ;;
+ esac
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -11902,7 +12107,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.
@@ -3217,7 +5597,34 @@
      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 \
-@@ -12075,7 +11915,7 @@
+@@ -12016,11 +12222,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12050,6 +12256,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -12080,7 +12292,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -3226,7 +5633,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12106,7 +11946,7 @@
+@@ -12111,7 +12323,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -3235,7 +5642,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12348,7 +12188,10 @@
+@@ -12126,7 +12338,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -12353,7 +12565,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.
@@ -3247,7 +5663,84 @@
  fi
  
  
-@@ -12616,8 +12459,8 @@
+@@ -12418,7 +12633,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -12455,7 +12672,7 @@
+ compiler_lib_search_path_CXX=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12476,6 +12693,20 @@
+ 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
++_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
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -12497,7 +12728,16 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12568,7 +12808,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -12602,7 +12842,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -12621,8 +12861,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
@@ -3258,7 +5751,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12643,7 +12486,7 @@
+@@ -12648,7 +12888,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.
@@ -3267,7 +5760,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12674,8 +12517,22 @@
+@@ -12679,8 +12919,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -3292,7 +5785,26 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12721,15 +12578,16 @@
+@@ -12697,7 +12951,7 @@
+     link_all_deplibs_CXX=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.012|aix4.012.*)
++      case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -12718,6 +12972,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -12726,15 +12983,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -3313,7 +5825,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.
-@@ -12759,8 +12617,7 @@
+@@ -12764,8 +13022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3323,7 +5835,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12789,13 +12646,12 @@
+@@ -12794,13 +13051,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -3339,7 +5851,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12822,8 +12678,7 @@
+@@ -12827,8 +13083,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3349,16 +5861,23 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12861,7 +12716,7 @@
+@@ -12865,8 +13120,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	# 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'
        fi
      fi
      ;;
-@@ -12878,12 +12733,12 @@
+@@ -12879,16 +13134,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
      # _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'
@@ -3373,7 +5892,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12892,7 +12747,7 @@
+@@ -12897,70 +13153,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -3382,87 +5901,170 @@
      else
        ld_shlibs_CXX=no
      fi
-@@ -12903,20 +12758,20 @@
-     archive_cmds_need_lc_CXX=no
-     case "$host_os" in
-     rhapsody* | darwin1.[012])
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    archive_cmds_need_lc_CXX=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
 -      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-+      allow_undefined_flag_CXX='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.012)
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+            ;;
-+        esac
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
        fi
-       ;;
-     esac
-@@ -12926,19 +12781,19 @@
-       lt_int_apple_cc_single_mod=yes
-     fi
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     else
+-    else
 -      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     fi
+-    fi
 -    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- 
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
+-    else
 -      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
+-    fi
 -    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     hardcode_direct_CXX=no
-     hardcode_automatic_CXX=yes
-     hardcode_shlibpath_var_CXX=unsupported
-@@ -12973,7 +12828,7 @@
+-    hardcode_direct_CXX=no
+-    hardcode_automatic_CXX=yes
+-    hardcode_shlibpath_var_CXX=unsupported
+-    whole_archive_flag_spec_CXX='-all_load $convenience'
+-    link_all_deplibs_CXX=yes
+-  else
+-    ld_shlibs_CXX=no
+-  fi
+-    ;;
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -12971,14 +13238,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd12*)
++  freebsd[12]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     ld_shlibs_CXX=no
+     ;;
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12995,7 +12850,7 @@
+@@ -12995,12 +13262,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
        ld_shlibs_CXX=no
        ;;
-     aCC)
+-    aCC)
 -      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
 +      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13004,11 +12859,11 @@
+@@ -13009,11 +13276,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
@@ -3471,7 +6073,38 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13065,7 +12920,7 @@
+@@ -13023,7 +13290,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+@@ -13039,7 +13306,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       hardcode_direct_CXX=no
+       hardcode_shlibpath_var_CXX=no
+@@ -13060,17 +13327,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
  	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -3480,7 +6113,13 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13086,7 +12941,7 @@
+@@ -13086,12 +13353,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
  	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -3489,28 +6128,38 @@
  	      ;;
  	    esac
  	  fi
-@@ -13101,7 +12956,7 @@
+@@ -13104,9 +13371,9 @@
+     ;;
+   irix5* | irix6*)
      case $cc_basename in
-       CC)
+-      CC)
++      CC*)
  	# SGI C++
 -	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13112,9 +12967,9 @@
+@@ -13117,9 +13384,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  	  else
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13131,8 +12986,8 @@
+@@ -13130,14 +13397,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -3521,19 +6170,49 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13154,16 +13009,16 @@
+@@ -13155,20 +13422,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
  	# Intel C++
  	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
  	archive_cmds_need_lc_CXX=no
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
  	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
-       cxx)
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
  	# Compaq C++
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3542,8 +6221,17 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13201,7 +13056,7 @@
+@@ -13196,7 +13487,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
  	;;
+@@ -13206,7 +13497,7 @@
+ 	;;
      esac
      ;;
 -  netbsd*)
@@ -3551,7 +6239,32 @@
      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=
-@@ -13220,7 +13075,7 @@
+@@ -13217,15 +13508,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -3560,25 +6273,41 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13237,7 +13092,7 @@
+@@ -13235,14 +13542,14 @@
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
  	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13255,7 +13110,7 @@
+@@ -13260,7 +13567,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13280,7 +13135,7 @@
+@@ -13279,13 +13586,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -3587,50 +6316,123 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13296,10 +13151,10 @@
+@@ -13294,17 +13601,17 @@
+ 	# the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
  	allow_undefined_flag_CXX=' -expect_unresolved \*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
  	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13318,7 +13173,7 @@
+@@ -13323,7 +13630,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13375,9 +13230,9 @@
-       CC)
+@@ -13347,7 +13654,7 @@
+   sco*)
+     archive_cmds_need_lc_CXX=no
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+@@ -13359,12 +13666,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13377,36 +13684,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
  	# Sun C++ 4.2, 5.x and Centerline C++
++        archive_cmds_need_lc_CXX=yes
  	no_undefined_flag_CXX=' -zdefs'
 -	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-R$libdir'
  	hardcode_shlibpath_var_CXX=no
-@@ -13411,7 +13266,7 @@
+ 	case $host_os in
+-	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -13414,9 +13718,9 @@
+ 	# in the archive.
+ 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
-       gcx)
+-      gcx)
++      gcx*)
  	# Green Hills C++ Compiler
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13421,9 +13276,9 @@
+@@ -13426,9 +13730,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
@@ -3642,7 +6444,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13432,9 +13287,9 @@
+@@ -13437,9 +13741,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -3654,7 +6456,25 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13549,7 +13404,7 @@
+@@ -13457,7 +13761,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13514,7 +13818,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -13554,7 +13858,7 @@
         fi
         ;;
  
@@ -3663,17 +6483,142 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13684,7 +13539,7 @@
+@@ -13590,6 +13894,20 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    postdeps_CXX='-lCstd -lCrun'
++    ;;
++  esac
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13645,7 +13963,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -13670,18 +13988,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -13689,22 +14017,22 @@
+ 	    ;;
  	esac
  	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13760,7 +13615,7 @@
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      lt_prog_compiler_pic_CXX='+Z'
+ 	    fi
  	    ;;
+-	  aCC)
++	  aCC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -13719,7 +14047,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -13730,18 +14058,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -13758,25 +14092,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    lt_prog_compiler_pic_CXX='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
  	esac
  	;;
 -      netbsd*)
@@ -3681,21 +6626,105 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -13871,11 +13726,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-	  KCC)
++	  KCC*)
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -13792,7 +14126,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -13801,13 +14135,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    lt_prog_compiler_wl_CXX='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-PIC'
+ 	    ;;
+@@ -13817,12 +14151,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -13832,7 +14166,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+@@ -13873,18 +14207,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13874: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13729: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13879: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14213: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13878: \$? = $ac_status" >&5
-+   echo "$as_me:13733: \$? = $ac_status" >&5
+-   echo "$as_me:13883: \$? = $ac_status" >&5
++   echo "$as_me:14217: \$? = $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
-@@ -13922,13 +13777,6 @@
+-     # 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
+        lt_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+@@ -13905,7 +14241,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_CXX=
+@@ -13927,38 +14263,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -3709,26 +6738,35 @@
     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.
-@@ -13938,11 +13786,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13941: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13789: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13946: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14275: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13945: \$? = $ac_status" >&5
-+   echo "$as_me:13793: \$? = $ac_status" >&5
+-   echo "$as_me:13950: \$? = $ac_status" >&5
++   echo "$as_me:14279: \$? = $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
-@@ -13952,8 +13800,11 @@
+      # 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
+        lt_cv_prog_compiler_c_o_CXX=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -3737,17 +6775,19 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14005,6 +13856,9 @@
+@@ -14008,7 +14342,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 '\''/^[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*)
 +    link_all_deplibs_CXX=no
-+  ;;
+   ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -14086,7 +13940,7 @@
+@@ -14091,7 +14428,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -3756,7 +6796,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14096,7 +13950,20 @@
+@@ -14101,7 +14438,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3778,7 +6818,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14161,7 +14028,7 @@
+@@ -14166,7 +14516,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3787,8 +6827,17 @@
    ;;
  
  beos*)
-@@ -14186,7 +14053,7 @@
+@@ -14175,7 +14525,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14191,7 +14541,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -3796,34 +6845,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14251,7 +14118,7 @@
+@@ -14203,7 +14553,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -14233,7 +14584,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -14256,7 +14607,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14274,7 +14141,7 @@
+@@ -14279,7 +14630,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14334,7 +14201,7 @@
+@@ -14291,8 +14642,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -14310,7 +14670,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -14337,9 +14697,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14349,7 +14216,7 @@
+@@ -14354,7 +14714,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -3832,7 +6932,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14360,7 +14227,7 @@
+@@ -14365,7 +14725,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -3841,7 +6941,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14422,22 +14289,19 @@
+@@ -14427,22 +14787,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -3863,14 +6963,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14447,6 +14311,30 @@
+@@ -14452,6 +14809,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -3901,7 +7001,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14456,7 +14344,7 @@
+@@ -14461,7 +14842,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -3910,16 +7010,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14485,7 +14373,7 @@
+@@ -14490,7 +14871,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14505,7 +14393,7 @@
+@@ -14510,7 +14895,7 @@
  
  os2*)
    libname_spec='$name'
@@ -3928,7 +7032,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14734,8 +14622,7 @@
+@@ -14612,8 +14997,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+-   test -n "$runpath_var CXX" || \
+-   test "X$hardcode_automatic_CXX"="Xyes" ; then
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_CXX" != no &&
+@@ -14739,8 +15124,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3938,7 +7053,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14838,8 +14725,7 @@
+@@ -14843,8 +15227,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3948,7 +7063,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14904,8 +14790,7 @@
+@@ -14909,8 +15292,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3958,7 +7073,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14998,8 +14883,7 @@
+@@ -15003,8 +15385,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3968,7 +7083,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15064,8 +14948,7 @@
+@@ -15069,8 +15450,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3978,7 +7093,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15131,8 +15014,7 @@
+@@ -15136,8 +15516,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3988,7 +7103,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15198,8 +15080,7 @@
+@@ -15203,8 +15582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3998,25 +7113,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15274,7 +15155,7 @@
+@@ -15279,7 +15657,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15277 "configure"
-+#line 15158 "configure"
+-#line 15282 "configure"
++#line 15660 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15372,7 +15253,7 @@
+@@ -15345,7 +15723,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 ;;
+@@ -15377,7 +15755,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15375 "configure"
-+#line 15256 "configure"
+-#line 15380 "configure"
++#line 15758 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15489,7 +15370,8 @@
+@@ -15443,7 +15821,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 ;;
+@@ -15494,7 +15872,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.
@@ -4026,7 +7159,20 @@
      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 \
-@@ -15619,7 +15501,7 @@
+@@ -15594,6 +15973,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -15624,7 +16009,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -4035,7 +7181,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15650,7 +15532,7 @@
+@@ -15655,7 +16040,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -4044,7 +7190,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15867,7 +15749,10 @@
+@@ -15670,7 +16055,7 @@
+ # 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
+ 
+ # Do we need the lib prefix for modules?
+@@ -15872,7 +16257,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.
@@ -4056,30 +7211,185 @@
  fi
  
  
-@@ -15969,7 +15854,7 @@
+@@ -15948,12 +16336,35 @@
+ 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
++_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
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+@@ -15966,7 +16377,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -15974,8 +16385,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
    ;;
  esac
-@@ -16195,11 +16080,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16052,7 +16465,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16078,6 +16491,16 @@
+ 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -16089,7 +16512,7 @@
+       lt_prog_compiler_wl_F77='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16113,12 +16536,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+ 	lt_prog_compiler_pic_F77='-KPIC'
+ 	lt_prog_compiler_static_F77='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fpic'
++	lt_prog_compiler_static_F77='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_F77='-Wl,'
+         # All Alpha code is PIC.
+@@ -16139,9 +16569,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_F77='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_F77='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -16163,6 +16598,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_F77='-pic'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -16197,18 +16637,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16083: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16643: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16202: \$? = $ac_status" >&5
-+   echo "$as_me:16087: \$? = $ac_status" >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16647: \$? = $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
-@@ -16246,13 +16131,6 @@
+-     # 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
+        lt_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+@@ -16229,7 +16671,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_F77=
+@@ -16251,38 +16693,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4093,26 +7403,35 @@
     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.
-@@ -16262,11 +16140,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16143: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16270: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16705: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16269: \$? = $ac_status" >&5
-+   echo "$as_me:16147: \$? = $ac_status" >&5
+-   echo "$as_me:16274: \$? = $ac_status" >&5
++   echo "$as_me:16709: \$? = $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
-@@ -16276,8 +16154,11 @@
+      # 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
+        lt_cv_prog_compiler_c_o_F77=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -4121,7 +7440,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16405,7 +16286,7 @@
+@@ -16353,6 +16793,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -16373,6 +16823,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -16410,7 +16881,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4130,7 +7494,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16415,13 +16296,13 @@
+@@ -16420,13 +16891,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'
@@ -4138,7 +7502,8 @@
 +      allow_undefined_flag_F77=unsupported
        always_export_symbols_F77=no
        enable_shared_with_static_runtimes_F77=yes
-       export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4146,14 +7511,47 @@
  	# 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
-@@ -16430,19 +16311,19 @@
+@@ -16435,19 +16906,51 @@
  	  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'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_F77=no
++      else
++	ld_shlibs_F77=no
        fi
        ;;
  
@@ -4170,7 +7568,7 @@
        fi
        ;;
  
-@@ -16460,8 +16341,8 @@
+@@ -16465,8 +16968,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4181,36 +7579,8 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16474,10 +16355,36 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
+@@ -16481,24 +16984,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_F77="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_F77="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_F77=no
-+    else
-+      ld_shlibs_F77=no
-+    fi
-+    ;;
-+
      *)
        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'
@@ -4220,7 +7590,28 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16527,9 +16434,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
++    if test "$ld_shlibs_F77" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_F77=
++      export_dynamic_flag_spec_F77=
++      whole_archive_flag_spec_F77=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16532,9 +17030,20 @@
  	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
@@ -4243,7 +7634,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16575,21 +16493,22 @@
+@@ -16551,7 +17060,7 @@
+       link_all_deplibs_F77=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -16572,6 +17081,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -16580,21 +17092,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4271,7 +7681,7 @@
        program main
  
        end
-@@ -16603,8 +16522,7 @@
+@@ -16608,8 +17121,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4281,7 +7691,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16631,14 +16549,13 @@
+@@ -16636,14 +17148,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4299,7 +7709,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16655,8 +16572,7 @@
+@@ -16660,8 +17171,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4309,16 +7719,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16694,7 +16610,7 @@
+@@ -16698,8 +17208,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # 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'
  	fi
        fi
        ;;
-@@ -16717,13 +16633,13 @@
+@@ -16712,7 +17222,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_F77=-rdynamic
+       ;;
+ 
+@@ -16722,68 +17232,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -4335,78 +7756,114 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
-@@ -16737,21 +16653,21 @@
-       archive_cmds_need_lc_F77=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag_F77='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.012)
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_F77='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -16760,18 +16676,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_F77=no
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
-@@ -16812,8 +16728,8 @@
+-      whole_archive_flag_spec_F77='-all_load $convenience'
++      whole_archive_flag_spec_F77=''
+       link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs_F77=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -16817,8 +17327,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | 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
-@@ -16821,7 +16737,7 @@
+@@ -16826,7 +17336,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -4415,9 +7872,12 @@
        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
-@@ -16839,10 +16755,10 @@
+@@ -16842,16 +17352,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	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 ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4428,7 +7888,21 @@
  	  ;;
  	esac
        else
-@@ -16889,7 +16805,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -16861,7 +17371,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+@@ -16894,7 +17404,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -4437,7 +7911,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16899,7 +16815,7 @@
+@@ -16904,7 +17414,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -4446,16 +7920,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16922,7 +16838,7 @@
+@@ -16927,7 +17437,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16932,7 +16848,7 @@
+@@ -16937,7 +17448,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -4464,7 +7939,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16943,14 +16859,14 @@
+@@ -16948,14 +17459,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -4481,7 +7956,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'
-@@ -16962,7 +16878,7 @@
+@@ -16967,13 +17478,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -4490,19 +7965,50 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16987,9 +16903,9 @@
+ 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -16992,10 +17503,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -17009,7 +16925,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -17004,8 +17517,18 @@
+       hardcode_shlibpath_var_F77=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -17014,7 +17537,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.
@@ -4511,7 +8017,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17069,9 +16985,9 @@
+@@ -17074,9 +17597,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -4523,7 +8029,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17177,7 +17093,7 @@
+@@ -17182,7 +17705,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -4532,7 +8038,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17187,7 +17103,20 @@
+@@ -17192,7 +17715,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4554,7 +8060,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17252,7 +17181,7 @@
+@@ -17257,7 +17793,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4563,8 +8069,17 @@
    ;;
  
  beos*)
-@@ -17277,7 +17206,7 @@
+@@ -17266,7 +17802,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17282,7 +17818,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -4572,34 +8087,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17342,7 +17271,7 @@
+@@ -17294,7 +17830,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -17324,7 +17861,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -17347,7 +17884,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17365,7 +17294,7 @@
+@@ -17370,7 +17907,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17425,7 +17354,7 @@
+@@ -17382,8 +17919,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -17401,7 +17947,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -17428,9 +17974,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17440,7 +17369,7 @@
+@@ -17445,7 +17991,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -4608,7 +8174,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17451,7 +17380,7 @@
+@@ -17456,7 +18002,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -4617,7 +8183,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17513,22 +17442,19 @@
+@@ -17518,22 +18064,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -4639,14 +8205,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17538,6 +17464,30 @@
+@@ -17543,6 +18086,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -4677,7 +8243,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17547,7 +17497,7 @@
+@@ -17552,7 +18119,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -4686,16 +8252,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17576,7 +17526,7 @@
+@@ -17581,7 +18148,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17596,7 +17546,7 @@
+@@ -17601,7 +18172,7 @@
  
  os2*)
    libname_spec='$name'
@@ -4704,7 +8274,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17775,7 +17725,8 @@
+@@ -17703,8 +18274,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_F77" != no &&
+@@ -17780,7 +18351,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.
@@ -4714,7 +8295,20 @@
      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 \
-@@ -17905,7 +17856,7 @@
+@@ -17880,6 +18452,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -17910,7 +18488,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -4723,7 +8317,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17936,7 +17887,7 @@
+@@ -17941,7 +18519,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -4732,7 +8326,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18153,7 +18104,10 @@
+@@ -17956,7 +18534,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -18158,7 +18736,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.
@@ -4744,35 +8347,203 @@
  fi
  
  
-@@ -18235,11 +18189,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18191,7 +18772,7 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -18202,15 +18783,41 @@
+ 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
++_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
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+ 
++old_archive_cmds_GCJ=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -18237,18 +18844,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18238: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18192: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18243: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18850: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18242: \$? = $ac_status" >&5
-+   echo "$as_me:18196: \$? = $ac_status" >&5
+-   echo "$as_me:18247: \$? = $ac_status" >&5
++   echo "$as_me:18854: \$? = $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
-@@ -18468,11 +18422,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-     # 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
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -18325,7 +18934,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18351,6 +18960,16 @@
+ 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -18362,7 +18981,7 @@
+       lt_prog_compiler_wl_GCJ='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18386,12 +19005,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+ 	lt_prog_compiler_pic_GCJ='-KPIC'
+ 	lt_prog_compiler_static_GCJ='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-fpic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         # All Alpha code is PIC.
+@@ -18412,9 +19038,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_GCJ='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -18436,6 +19067,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_GCJ='-pic'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18470,18 +19106,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18471: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18425: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18476: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19112: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18475: \$? = $ac_status" >&5
-+   echo "$as_me:18429: \$? = $ac_status" >&5
+-   echo "$as_me:18480: \$? = $ac_status" >&5
++   echo "$as_me:19116: \$? = $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
-@@ -18519,13 +18473,6 @@
+-     # 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
+        lt_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+@@ -18502,7 +19140,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_GCJ=
+@@ -18524,38 +19162,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4786,26 +8557,35 @@
     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.
-@@ -18535,11 +18482,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18538: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18485: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18543: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19174: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18542: \$? = $ac_status" >&5
-+   echo "$as_me:18489: \$? = $ac_status" >&5
+-   echo "$as_me:18547: \$? = $ac_status" >&5
++   echo "$as_me:19178: \$? = $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
-@@ -18549,8 +18496,11 @@
+      # 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
+        lt_cv_prog_compiler_c_o_GCJ=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -4814,7 +8594,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18678,7 +18628,7 @@
+@@ -18626,6 +19262,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -18646,6 +19292,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -18683,7 +19350,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4823,7 +8648,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18688,13 +18638,13 @@
+@@ -18693,13 +19360,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'
@@ -4831,7 +8656,8 @@
 +      allow_undefined_flag_GCJ=unsupported
        always_export_symbols_GCJ=no
        enable_shared_with_static_runtimes_GCJ=yes
-       export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4839,14 +8665,47 @@
  	# 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
-@@ -18703,19 +18653,19 @@
+@@ -18708,19 +19375,51 @@
  	  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'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_GCJ=no
++      else
++	ld_shlibs_GCJ=no
        fi
        ;;
  
@@ -4863,7 +8722,7 @@
        fi
        ;;
  
-@@ -18733,8 +18683,8 @@
+@@ -18738,8 +19437,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4874,36 +8733,8 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18747,10 +18697,36 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
+@@ -18754,24 +19453,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_GCJ="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_GCJ=no
-+    else
-+      ld_shlibs_GCJ=no
-+    fi
-+    ;;
-+
      *)
        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'
@@ -4913,7 +8744,28 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18800,9 +18776,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_GCJ" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-      fi
++    if test "$ld_shlibs_GCJ" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_GCJ=
++      export_dynamic_flag_spec_GCJ=
++      whole_archive_flag_spec_GCJ=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -18805,9 +19499,20 @@
  	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
@@ -4936,7 +8788,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18848,21 +18835,22 @@
+@@ -18824,7 +19529,7 @@
+       link_all_deplibs_GCJ=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -18845,6 +19550,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -18853,21 +19561,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4964,7 +8835,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18886,8 +18874,7 @@
+@@ -18891,8 +19600,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4974,7 +8845,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18914,14 +18901,13 @@
+@@ -18919,14 +19627,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4992,7 +8863,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18948,8 +18934,7 @@
+@@ -18953,8 +19660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5002,16 +8873,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18987,7 +18972,7 @@
+@@ -18991,8 +19697,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # 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'
  	fi
        fi
        ;;
-@@ -19010,13 +18995,13 @@
+@@ -19005,7 +19711,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_GCJ=-rdynamic
+       ;;
+ 
+@@ -19015,68 +19721,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -5028,78 +8910,114 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
-@@ -19030,21 +19015,21 @@
-       archive_cmds_need_lc_GCJ=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_GCJ=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag_GCJ='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.012)
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -19053,18 +19038,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_GCJ=no
        hardcode_direct_GCJ=no
        hardcode_automatic_GCJ=yes
        hardcode_shlibpath_var_GCJ=unsupported
-@@ -19105,8 +19090,8 @@
+-      whole_archive_flag_spec_GCJ='-all_load $convenience'
++      whole_archive_flag_spec_GCJ=''
+       link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs_GCJ=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -19110,8 +19816,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | 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
-@@ -19114,7 +19099,7 @@
+@@ -19119,7 +19825,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5108,9 +9026,12 @@
        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
-@@ -19132,10 +19117,10 @@
+@@ -19135,16 +19841,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	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 ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5121,7 +9042,21 @@
  	  ;;
  	esac
        else
-@@ -19182,7 +19167,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -19154,7 +19860,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+@@ -19187,7 +19893,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5130,7 +9065,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19192,7 +19177,7 @@
+@@ -19197,7 +19903,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -5139,16 +9074,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19215,7 +19200,7 @@
+@@ -19220,7 +19926,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19225,7 +19210,7 @@
+@@ -19230,7 +19937,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -5157,7 +9093,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19236,14 +19221,14 @@
+@@ -19241,14 +19948,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -5174,7 +9110,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'
-@@ -19255,7 +19240,7 @@
+@@ -19260,13 +19967,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5183,19 +9119,50 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19280,9 +19265,9 @@
+ 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19285,10 +19992,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19302,7 +19287,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19297,8 +20006,18 @@
+       hardcode_shlibpath_var_GCJ=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -19307,7 +20026,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.
@@ -5204,7 +9171,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19362,9 +19347,9 @@
+@@ -19367,9 +20086,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5216,7 +9183,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19470,7 +19455,7 @@
+@@ -19475,7 +20194,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5225,7 +9192,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19480,7 +19465,20 @@
+@@ -19485,7 +20204,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5247,7 +9214,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19545,7 +19543,7 @@
+@@ -19550,7 +20282,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5256,8 +9223,17 @@
    ;;
  
  beos*)
-@@ -19570,7 +19568,7 @@
+@@ -19559,7 +20291,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19575,7 +20307,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -5265,34 +9241,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19635,7 +19633,7 @@
+@@ -19587,7 +20319,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -19617,7 +20350,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -19640,7 +20373,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19658,7 +19656,7 @@
+@@ -19663,7 +20396,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19718,7 +19716,7 @@
+@@ -19675,8 +20408,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -19694,7 +20436,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -19721,9 +20463,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19733,7 +19731,7 @@
+@@ -19738,7 +20480,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5301,7 +9328,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19744,7 +19742,7 @@
+@@ -19749,7 +20491,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5310,7 +9337,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19806,22 +19804,19 @@
+@@ -19811,22 +20553,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5332,14 +9359,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -19831,6 +19826,30 @@
+@@ -19836,6 +20575,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5370,7 +9397,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19840,7 +19859,7 @@
+@@ -19845,7 +20608,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5379,16 +9406,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19869,7 +19888,7 @@
+@@ -19874,7 +20637,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -19889,7 +19908,7 @@
+@@ -19894,7 +20661,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5397,7 +9428,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20118,8 +20137,7 @@
+@@ -19996,8 +20763,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" || \
+-   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 &&
+@@ -20123,8 +20890,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5407,7 +9449,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20222,8 +20240,7 @@
+@@ -20227,8 +20993,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5417,7 +9459,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20288,8 +20305,7 @@
+@@ -20293,8 +21058,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5427,7 +9469,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20382,8 +20398,7 @@
+@@ -20387,8 +21151,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5437,7 +9479,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20448,8 +20463,7 @@
+@@ -20453,8 +21216,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5447,7 +9489,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20515,8 +20529,7 @@
+@@ -20520,8 +21282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5457,7 +9499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20582,8 +20595,7 @@
+@@ -20587,8 +21348,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5467,25 +9509,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20658,7 +20670,7 @@
+@@ -20663,7 +21423,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20661 "configure"
-+#line 20673 "configure"
+-#line 20666 "configure"
++#line 21426 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20756,7 +20768,7 @@
+@@ -20729,7 +21489,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 ;;
+@@ -20761,7 +21521,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20759 "configure"
-+#line 20771 "configure"
+-#line 20764 "configure"
++#line 21524 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20873,7 +20885,8 @@
+@@ -20827,7 +21587,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 ;;
+@@ -20878,7 +21638,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.
@@ -5495,7 +9555,20 @@
      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 \
-@@ -21003,7 +21016,7 @@
+@@ -20978,6 +21739,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21008,7 +21775,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5504,7 +9577,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21034,7 +21047,7 @@
+@@ -21039,7 +21806,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5513,7 +9586,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21251,7 +21264,10 @@
+@@ -21054,7 +21821,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21256,7 +22023,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.
@@ -5525,7 +9607,43 @@
  fi
  
  
-@@ -21314,7 +21330,8 @@
+@@ -21299,11 +22069,35 @@
+ 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
++_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
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ lt_cv_prog_compiler_c_o_RC=yes
+ 
+ # The else clause should only fire when bootstrapping the
+@@ -21319,7 +22113,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.
@@ -5535,7 +9653,20 @@
      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 \
-@@ -21444,7 +21461,7 @@
+@@ -21419,6 +22214,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21449,7 +22250,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5544,7 +9675,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21475,7 +21492,7 @@
+@@ -21480,7 +22281,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5553,7 +9684,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21692,7 +21709,10 @@
+@@ -21495,7 +22296,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21697,7 +22498,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.
@@ -5565,7 +9705,7 @@
  fi
  
  
-@@ -21739,7 +21759,7 @@
+@@ -21744,7 +22548,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -5574,7 +9714,7 @@
  
  # Prevent multiple expansion
  
-@@ -21976,8 +21996,7 @@
+@@ -21985,8 +22789,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5584,7 +9724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22051,9 +22070,6 @@
+@@ -22060,9 +22863,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5594,7 +9734,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22087,8 +22103,7 @@
+@@ -22096,8 +22896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5604,7 +9744,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22192,8 +22207,7 @@
+@@ -22201,8 +23000,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5614,7 +9754,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22272,9 +22286,6 @@
+@@ -22281,9 +23079,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5624,7 +9764,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22307,8 +22318,7 @@
+@@ -22316,8 +23111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5634,7 +9774,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22411,8 +22421,7 @@
+@@ -22420,8 +23214,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5644,7 +9784,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22502,8 +22511,7 @@
+@@ -22511,8 +23304,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5654,7 +9794,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22564,8 +22572,7 @@
+@@ -22573,8 +23365,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5664,7 +9804,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22633,8 +22640,7 @@
+@@ -22642,8 +23433,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5674,7 +9814,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22700,8 +22706,7 @@
+@@ -22709,8 +23499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5684,7 +9824,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22794,8 +22799,7 @@
+@@ -22803,8 +23592,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5694,7 +9834,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22873,8 +22877,7 @@
+@@ -22882,8 +23670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5704,7 +9844,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22958,8 +22961,7 @@
+@@ -22967,8 +23754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5714,7 +9854,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23027,8 +23029,7 @@
+@@ -23036,8 +23822,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5724,7 +9864,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23123,8 +23124,7 @@
+@@ -23132,8 +23917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5734,7 +9874,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23188,8 +23188,7 @@
+@@ -23197,8 +23981,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5744,7 +9884,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23284,8 +23283,7 @@
+@@ -23293,8 +24076,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5754,7 +9894,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23349,8 +23347,7 @@
+@@ -23358,8 +24140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5764,7 +9904,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23446,8 +23443,7 @@
+@@ -23455,8 +24236,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5774,7 +9914,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23511,8 +23507,7 @@
+@@ -23520,8 +24300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5784,7 +9924,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23609,8 +23604,7 @@
+@@ -23618,8 +24397,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5794,7 +9934,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23675,8 +23669,7 @@
+@@ -23684,8 +24462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5804,7 +9944,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23744,8 +23737,7 @@
+@@ -23753,8 +24530,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5814,7 +9954,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23896,8 +23888,7 @@
+@@ -23905,8 +24681,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5824,7 +9964,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24052,8 +24043,7 @@
+@@ -24061,8 +24836,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5834,7 +9974,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24118,8 +24108,7 @@
+@@ -24127,8 +24901,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5844,7 +9984,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24266,8 +24255,7 @@
+@@ -24275,8 +25048,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5854,7 +9994,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24422,8 +24410,7 @@
+@@ -24431,8 +25203,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5864,7 +10004,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24479,9 +24466,6 @@
+@@ -24488,9 +25259,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5874,7 +10014,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24515,8 +24499,7 @@
+@@ -24524,8 +25292,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5884,7 +10024,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24620,8 +24603,7 @@
+@@ -24629,8 +25396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5894,7 +10034,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24721,8 +24703,7 @@
+@@ -24730,8 +25496,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5904,7 +10044,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24796,8 +24777,7 @@
+@@ -24805,8 +25570,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5914,7 +10054,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24860,8 +24840,7 @@
+@@ -24869,8 +25633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5924,7 +10064,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24923,8 +24902,7 @@
+@@ -24932,8 +25695,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5934,7 +10074,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24964,8 +24942,7 @@
+@@ -24973,8 +25735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5944,7 +10084,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25021,8 +24998,7 @@
+@@ -25030,8 +25791,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5954,7 +10094,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25062,8 +25038,7 @@
+@@ -25071,8 +25831,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5964,7 +10104,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25127,8 +25102,7 @@
+@@ -25136,8 +25895,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5974,7 +10114,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25159,10 +25133,8 @@
+@@ -25168,10 +25926,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -5987,7 +10127,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25273,8 +25245,7 @@
+@@ -25282,8 +26038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5997,7 +10137,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25336,8 +25307,7 @@
+@@ -25345,8 +26100,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6007,7 +10147,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25377,8 +25347,7 @@
+@@ -25386,8 +26140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6017,7 +10157,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25434,8 +25403,7 @@
+@@ -25443,8 +26196,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6027,7 +10167,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25475,8 +25443,7 @@
+@@ -25484,8 +26236,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6037,7 +10177,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25540,8 +25507,7 @@
+@@ -25549,8 +26300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6047,7 +10187,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25572,10 +25538,8 @@
+@@ -25581,10 +26331,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6060,7 +10200,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25686,8 +25650,7 @@
+@@ -25695,8 +26443,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6070,7 +10210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25749,8 +25712,7 @@
+@@ -25758,8 +26505,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6080,7 +10220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25790,8 +25752,7 @@
+@@ -25799,8 +26545,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6090,7 +10230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25847,8 +25808,7 @@
+@@ -25856,8 +26601,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6100,7 +10240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25888,8 +25848,7 @@
+@@ -25897,8 +26641,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6110,7 +10250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25953,8 +25912,7 @@
+@@ -25962,8 +26705,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6120,7 +10260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25985,10 +25943,8 @@
+@@ -25994,10 +26736,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6133,7 +10273,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26099,8 +26055,7 @@
+@@ -26108,8 +26848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6143,7 +10283,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26162,8 +26117,7 @@
+@@ -26171,8 +26910,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6153,7 +10293,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26203,8 +26157,7 @@
+@@ -26212,8 +26950,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6163,7 +10303,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26260,8 +26213,7 @@
+@@ -26269,8 +27006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6173,7 +10313,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26301,8 +26253,7 @@
+@@ -26310,8 +27046,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6183,7 +10323,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26366,8 +26317,7 @@
+@@ -26375,8 +27110,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6193,7 +10333,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26398,10 +26348,8 @@
+@@ -26407,10 +27141,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6206,7 +10346,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26520,8 +26468,7 @@
+@@ -26529,8 +27261,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6216,7 +10356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26592,8 +26539,7 @@
+@@ -26601,8 +27332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6226,7 +10366,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26663,8 +26609,7 @@
+@@ -26672,8 +27402,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6236,7 +10376,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26726,8 +26671,7 @@
+@@ -26735,8 +27464,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6246,7 +10386,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26767,8 +26711,7 @@
+@@ -26776,8 +27504,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6256,7 +10396,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26824,8 +26767,7 @@
+@@ -26833,8 +27560,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6266,7 +10406,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26865,8 +26807,7 @@
+@@ -26874,8 +27600,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6276,7 +10416,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26930,8 +26871,7 @@
+@@ -26939,8 +27664,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6286,7 +10426,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26962,10 +26902,8 @@
+@@ -26971,10 +27695,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6299,7 +10439,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27077,8 +27015,7 @@
+@@ -27086,8 +27808,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6309,7 +10449,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27140,8 +27077,7 @@
+@@ -27149,8 +27870,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6319,7 +10459,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27181,8 +27117,7 @@
+@@ -27190,8 +27910,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6329,7 +10469,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27238,8 +27173,7 @@
+@@ -27247,8 +27966,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6339,7 +10479,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27279,8 +27213,7 @@
+@@ -27288,8 +28006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6349,7 +10489,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27344,8 +27277,7 @@
+@@ -27353,8 +28070,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6359,7 +10499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27376,10 +27308,8 @@
+@@ -27385,10 +28101,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6372,7 +10512,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27490,8 +27420,7 @@
+@@ -27499,8 +28213,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6382,17 +10522,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27561,8 +27490,7 @@
+@@ -27581,8 +28294,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=$?
+@@ -27682,8 +28394,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=$?
-@@ -27742,8 +27670,7 @@
+@@ -27863,8 +28574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6402,7 +10552,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27852,8 +27779,7 @@
+@@ -27973,8 +28683,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6412,7 +10562,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28077,8 +28003,7 @@
+@@ -28198,8 +28907,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6422,7 +10572,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28301,8 +28226,7 @@
+@@ -28422,8 +29130,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6432,7 +10582,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28378,8 +28302,7 @@
+@@ -28499,8 +29206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6442,7 +10592,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28605,8 +28528,7 @@
+@@ -28726,8 +29432,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6452,7 +10602,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28681,8 +28603,7 @@
+@@ -28802,8 +29507,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6462,7 +10612,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28742,8 +28663,7 @@
+@@ -28863,8 +29567,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6472,7 +10622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28826,8 +28746,7 @@
+@@ -28947,8 +29650,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6482,7 +10632,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28920,8 +28839,7 @@
+@@ -29041,8 +29743,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6492,7 +10642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29095,8 +29013,7 @@
+@@ -29216,8 +29917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6502,7 +10652,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29194,8 +29111,7 @@
+@@ -29315,8 +30015,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6512,7 +10662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29288,8 +29204,7 @@
+@@ -29403,8 +30102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6522,7 +10672,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29372,8 +29287,7 @@
+@@ -29481,8 +30179,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6532,25 +10682,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29426,7 +29340,7 @@
+@@ -29535,7 +30232,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29429: $i/$j" >&5
-+    echo "configure: 29343: $i/$j" >&5
+-    echo "configure: 29538: $i/$j" >&5
++    echo "configure: 30235: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29729,7 +29643,7 @@
+@@ -29833,7 +30530,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29732: $i/$j" >&5
-+    echo "configure: 29646: $i/$j" >&5
+-    echo "configure: 29836: $i/$j" >&5
++    echo "configure: 30533: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30406,8 +30320,7 @@
+@@ -30510,8 +31207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6560,47 +10710,99 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30566,7 +30479,7 @@
+@@ -30670,7 +31366,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30569: $i/$j" >&5
-+    echo "configure: 30482: $i/$j" >&5
+-    echo "configure: 30673: $i/$j" >&5
++    echo "configure: 31369: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30596,7 +30509,7 @@
+@@ -30700,7 +31396,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30599: $i/$j" >&5
-+    echo "configure: 30512: $i/$j" >&5
+-    echo "configure: 30703: $i/$j" >&5
++    echo "configure: 31399: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30614,7 +30527,7 @@
+@@ -30718,7 +31414,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30617: $i/$j" >&5
-+    echo "configure: 30530: $i/$j" >&5
+-    echo "configure: 30721: $i/$j" >&5
++    echo "configure: 31417: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32132,7 +32045,7 @@
+@@ -32241,7 +32937,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32135: $i/$j" >&5
-+    echo "configure: 32048: $i/$j" >&5
+-    echo "configure: 32244: $i/$j" >&5
++    echo "configure: 32940: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32288,290 +32201,6 @@
+@@ -32401,345 +33097,6 @@
  
-   if test "x$GXX" = "xyes"; then
-     kde_have_gcc_visibility=no
+ 
+ 
 -
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
+-
+-  if test "x$GXX" = "xyes"; then
+-
+-
+-     ac_ext=cc
+-ac_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'
+-
+-
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+- #include <exception>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GCC visibility push" >/dev/null 2>&1; then
+-
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-      kde_stdc_visibility_patched=yes
+-else
+-
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-      { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+-                   visibility support. Disabling -fvisibility=hidden" >&5
+-echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+-                   visibility support. Disabling -fvisibility=hidden" >&2;}
+-
+-      kde_stdc_visibility_patched=no
+-fi
+-rm -f conftest*
+-
+-    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
+-
+-
+-    kde_have_gcc_visibility=no
+-
 -echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
 -echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
 -kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
@@ -6768,7 +10970,7 @@
 -echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
 -echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
 -
--      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 -        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 -
 -    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
@@ -6884,10 +11086,22 @@
 -
 -fi
 -
-   fi
- 
- 
-@@ -32611,8 +32240,7 @@
+-  fi
+-
+-
+ echo "$as_me:$LINENO: checking for Qt docs" >&5
+ echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
+ kde_qtdir=
+@@ -32753,7 +33110,7 @@
+ do
+   for j in qsql.html;
+   do
+-    echo "configure: 32756: $i/$j" >&5
++    echo "configure: 33113: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       QTDOCDIR=$i
+@@ -32946,8 +33303,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6897,7 +11111,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32765,8 +32393,7 @@
+@@ -33097,8 +33453,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6907,7 +11121,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32920,8 +32547,7 @@
+@@ -33247,8 +33602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6917,7 +11131,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33073,8 +32699,7 @@
+@@ -33401,8 +33755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6927,7 +11141,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33214,8 +32839,7 @@
+@@ -33556,8 +33909,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6937,7 +11151,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33271,8 +32895,7 @@
+@@ -33709,8 +34061,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6947,7 +11161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33334,8 +32957,7 @@
+@@ -33849,8 +34200,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6957,7 +11171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33418,8 +33040,7 @@
+@@ -33927,8 +34277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6967,7 +11181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33448,8 +33069,7 @@
+@@ -33957,8 +34306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6977,7 +11191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33519,8 +33139,7 @@
+@@ -34028,8 +34376,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6987,7 +11201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33572,8 +33191,7 @@
+@@ -34081,8 +34428,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6997,7 +11211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33644,8 +33262,7 @@
+@@ -34153,8 +34499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7007,7 +11221,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33697,8 +33314,7 @@
+@@ -34206,8 +34551,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7017,7 +11231,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33809,8 +33425,7 @@
+@@ -34318,8 +34662,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7027,7 +11241,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33864,9 +33479,6 @@
+@@ -34373,9 +34716,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7037,7 +11251,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33899,8 +33511,7 @@
+@@ -34408,8 +34748,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7047,7 +11261,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34003,8 +33614,7 @@
+@@ -34512,8 +34851,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7057,7 +11271,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34135,8 +33745,7 @@
+@@ -34644,8 +34982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7067,7 +11281,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34190,9 +33799,6 @@
+@@ -34699,9 +35036,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7077,7 +11291,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34223,8 +33829,7 @@
+@@ -34732,8 +35066,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7087,7 +11301,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34325,8 +33930,7 @@
+@@ -34834,8 +35167,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7097,7 +11311,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34405,9 +34009,6 @@
+@@ -34914,9 +35246,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7107,7 +11321,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34438,8 +34039,7 @@
+@@ -34947,8 +35276,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7117,7 +11331,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34540,8 +34140,7 @@
+@@ -35049,8 +35377,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7127,7 +11341,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34620,9 +34219,6 @@
+@@ -35129,9 +35456,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7137,7 +11351,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34658,8 +34254,7 @@
+@@ -35167,8 +35491,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7147,7 +11361,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34766,8 +34361,7 @@
+@@ -35275,8 +35598,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7157,7 +11371,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34846,9 +34440,6 @@
+@@ -35355,9 +35677,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7167,7 +11381,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34883,8 +34474,7 @@
+@@ -35392,8 +35711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7177,7 +11391,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34989,8 +34579,7 @@
+@@ -35498,8 +35816,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7187,7 +11401,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35082,8 +34671,7 @@
+@@ -35591,8 +35908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7197,7 +11411,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35125,8 +34713,7 @@
+@@ -35634,8 +35950,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7207,7 +11421,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35183,8 +34770,7 @@
+@@ -35692,8 +36007,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7217,7 +11431,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35343,8 +34929,7 @@
+@@ -35852,8 +36166,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7227,7 +11441,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35408,8 +34993,7 @@
+@@ -35917,8 +36230,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7237,7 +11451,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35474,8 +35058,7 @@
+@@ -35983,8 +36295,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7247,7 +11461,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35539,8 +35122,7 @@
+@@ -36048,8 +36359,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7257,7 +11471,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35616,8 +35198,7 @@
+@@ -36125,8 +36435,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7267,16 +11481,26 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35708,7 +35289,7 @@
+@@ -36274,8 +36583,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=$?
+@@ -36352,7 +36660,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 35711: $i/$j" >&5
-+    echo "configure: 35292: $i/$j" >&5
+-    echo "configure: 36355: $i/$j" >&5
++    echo "configure: 36663: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -35898,8 +35479,7 @@
+@@ -36542,8 +36850,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7286,7 +11510,15 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35981,8 +35561,7 @@
+@@ -36579,6 +36886,7 @@
+ 
+ 
+ 
++
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+     ac_ext=cc
+@@ -36624,8 +36932,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7296,7 +11528,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36436,8 +36015,7 @@
+@@ -37083,8 +37390,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7306,7 +11538,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36507,8 +36085,7 @@
+@@ -37154,8 +37460,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7316,7 +11548,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36570,8 +36147,7 @@
+@@ -37217,8 +37522,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7326,7 +11558,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36611,8 +36187,7 @@
+@@ -37258,8 +37562,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7336,7 +11568,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36668,8 +36243,7 @@
+@@ -37315,8 +37618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7346,7 +11578,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36709,8 +36283,7 @@
+@@ -37356,8 +37658,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7356,7 +11588,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36774,8 +36347,7 @@
+@@ -37421,8 +37722,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7366,7 +11598,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36806,10 +36378,8 @@
+@@ -37453,10 +37753,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7379,7 +11611,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36920,8 +36490,7 @@
+@@ -37567,8 +37865,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7389,7 +11621,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36983,8 +36552,7 @@
+@@ -37630,8 +37927,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7399,7 +11631,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37024,8 +36592,7 @@
+@@ -37671,8 +37967,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7409,7 +11641,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37081,8 +36648,7 @@
+@@ -37728,8 +38023,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7419,7 +11651,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37122,8 +36688,7 @@
+@@ -37769,8 +38063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7429,7 +11661,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37187,8 +36752,7 @@
+@@ -37834,8 +38127,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7439,7 +11671,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37219,10 +36783,8 @@
+@@ -37866,10 +38158,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7452,7 +11684,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37333,8 +36895,7 @@
+@@ -37980,8 +38270,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7462,7 +11694,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37396,8 +36957,7 @@
+@@ -38043,8 +38332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7472,7 +11704,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37437,8 +36997,7 @@
+@@ -38084,8 +38372,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7482,7 +11714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37494,8 +37053,7 @@
+@@ -38141,8 +38428,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7492,7 +11724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37535,8 +37093,7 @@
+@@ -38182,8 +38468,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7502,7 +11734,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37600,8 +37157,7 @@
+@@ -38247,8 +38532,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7512,7 +11744,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37632,10 +37188,8 @@
+@@ -38279,10 +38563,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7525,7 +11757,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37746,8 +37300,7 @@
+@@ -38393,8 +38675,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7535,7 +11767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37809,8 +37362,7 @@
+@@ -38456,8 +38737,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7545,7 +11777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37850,8 +37402,7 @@
+@@ -38497,8 +38777,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7555,7 +11787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37907,8 +37458,7 @@
+@@ -38554,8 +38833,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7565,7 +11797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37948,8 +37498,7 @@
+@@ -38595,8 +38873,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7575,7 +11807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38013,8 +37562,7 @@
+@@ -38660,8 +38937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7585,7 +11817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38045,10 +37593,8 @@
+@@ -38692,10 +38968,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7598,7 +11830,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -38183,8 +37729,7 @@
+@@ -38830,8 +39104,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7608,7 +11840,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38353,8 +37898,7 @@
+@@ -39000,8 +39273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7618,7 +11850,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38432,8 +37976,7 @@
+@@ -39078,8 +39350,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7628,7 +11860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38592,8 +38135,7 @@
+@@ -39238,8 +39509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7638,7 +11870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38656,8 +38198,7 @@
+@@ -39302,8 +39572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7648,7 +11880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38739,8 +38280,7 @@
+@@ -39385,8 +39654,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7658,7 +11890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38820,8 +38360,7 @@
+@@ -39466,8 +39734,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7668,7 +11900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38941,8 +38480,7 @@
+@@ -39597,8 +39864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7678,7 +11910,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39053,8 +38591,20 @@
+@@ -39726,8 +39992,20 @@
  	int main()
  	{
  #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -7701,7 +11933,7 @@
  		if ( maj != 1 ) {
  			return 1;
  		}
-@@ -39194,8 +38744,7 @@
+@@ -39880,8 +40158,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7711,16 +11943,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39284,7 +38833,7 @@
+@@ -39970,7 +40247,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 39287: $i/$j" >&5
-+    echo "configure: 38836: $i/$j" >&5
+-    echo "configure: 39973: $i/$j" >&5
++    echo "configure: 40250: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -39339,8 +38888,7 @@
+@@ -40025,8 +40302,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7730,7 +11962,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39656,8 +39204,7 @@
+@@ -40342,8 +40618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7740,7 +11972,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39762,8 +39309,7 @@
+@@ -40448,8 +40723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7750,7 +11982,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39862,8 +39408,7 @@
+@@ -40548,8 +40822,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7760,7 +11992,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40033,8 +39578,7 @@
+@@ -40719,8 +40992,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7770,7 +12002,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40248,8 +39792,7 @@
+@@ -41138,8 +41410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7780,7 +12012,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40291,8 +39834,7 @@
+@@ -41181,8 +41452,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7790,7 +12022,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40349,8 +39891,7 @@
+@@ -41239,8 +41509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7800,7 +12032,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40518,8 +40059,7 @@
+@@ -41408,8 +41677,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7810,7 +12042,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40579,8 +40119,7 @@
+@@ -41469,8 +41737,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7820,7 +12052,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40653,8 +40192,7 @@
+@@ -41543,8 +41810,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7830,7 +12062,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40718,8 +40256,7 @@
+@@ -41608,8 +41874,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7840,7 +12072,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40783,8 +40320,7 @@
+@@ -41673,8 +41938,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7850,7 +12082,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40849,8 +40385,7 @@
+@@ -41739,8 +42003,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7860,7 +12092,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40915,8 +40450,7 @@
+@@ -41805,8 +42068,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7870,7 +12102,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41019,8 +40553,7 @@
+@@ -41909,8 +42171,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7880,7 +12112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41159,8 +40692,7 @@
+@@ -42048,8 +42309,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7890,7 +12122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41226,8 +40758,7 @@
+@@ -42115,8 +42375,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7900,7 +12132,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41383,8 +40914,7 @@
+@@ -42272,8 +42531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7910,16 +12142,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41471,7 +41001,7 @@
+@@ -42360,7 +42618,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 41474: $i/$j" >&5
-+    echo "configure: 41004: $i/$j" >&5
+-    echo "configure: 42363: $i/$j" >&5
++    echo "configure: 42621: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -41526,8 +41056,7 @@
+@@ -42415,8 +42673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7929,7 +12161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41760,8 +41289,7 @@
+@@ -42648,8 +42905,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7939,7 +12171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41918,8 +41446,7 @@
+@@ -42806,8 +43062,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7949,7 +12181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42098,8 +41625,7 @@
+@@ -42986,8 +43241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7959,7 +12191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42165,8 +41691,7 @@
+@@ -43053,8 +43307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7969,7 +12201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42315,8 +41840,7 @@
+@@ -43203,8 +43456,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7979,7 +12211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42398,8 +41922,7 @@
+@@ -43286,8 +43538,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7989,7 +12221,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42505,8 +42028,7 @@
+@@ -43392,8 +43643,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7999,7 +12231,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42572,8 +42094,7 @@
+@@ -43459,8 +43709,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8009,7 +12241,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42619,8 +42140,7 @@
+@@ -43506,8 +43755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8019,7 +12251,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42697,8 +42217,7 @@
+@@ -43595,8 +43843,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8029,7 +12261,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42764,8 +42283,7 @@
+@@ -43658,8 +43905,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8039,7 +12271,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42825,8 +42343,7 @@
+@@ -43719,8 +43965,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8049,7 +12281,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43810,6 +43327,13 @@
+@@ -44733,6 +44978,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -8063,7 +12295,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
-@@ -44912,6 +44436,9 @@
+@@ -45858,6 +46110,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -8073,7 +12305,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -45338,11 +44865,6 @@
+@@ -46296,11 +46551,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -8085,7 +12317,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.  */
-@@ -45381,6 +44903,12 @@
+@@ -46339,6 +46589,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -8100,16 +12332,18 @@
    sed "$ac_vpsub
 --- configure.in
 +++ configure.in
-@@ -42,6 +42,8 @@
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+ 
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.4.3") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdenetwork, "3.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdenetwork-rc1, "3.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
  
-+AM_MAINTAINER_MODE
-+
  KDE_SET_PREFIX
  
- dnl generate the config header
-@@ -510,8 +512,20 @@
+@@ -526,8 +528,20 @@
  	int main()
  	{
  #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -8134,7 +12368,7 @@
  		}
 --- dcoprss/Makefile.in
 +++ dcoprss/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -265,6 +265,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8144,7 +12378,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8153,7 +12387,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8165,7 +12399,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -809,18 +812,18 @@
+@@ -821,18 +824,18 @@
  mocs: feedbrowser.moc
  
  #>+ 3
@@ -8190,7 +12424,7 @@
  
  #>+ 3
  service.moc: $(srcdir)/service.h
-@@ -841,7 +844,7 @@
+@@ -853,7 +856,7 @@
  
  #>+ 3
  clean-metasources:
@@ -8199,7 +12433,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh 
-@@ -907,7 +910,7 @@
+@@ -919,7 +922,7 @@
  	rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
  
  #>+ 11
@@ -8210,7 +12444,7 @@
  	echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
 --- doc/kcontrol/kcmktalkd/Makefile.in
 +++ doc/kcontrol/kcmktalkd/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8220,7 +12454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8229,7 +12463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8243,7 +12477,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/lanbrowser/Makefile.in
 +++ doc/kcontrol/lanbrowser/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8253,7 +12487,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8262,7 +12496,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8276,7 +12510,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/Makefile.in
 +++ doc/kcontrol/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8286,7 +12520,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
@@ -8295,7 +12529,7 @@
  KDE_LANG = en
  KDE_DOCS = AUTO
  #>- all: all-recursive
-@@ -401,7 +404,7 @@
+@@ -413,7 +416,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -8304,7 +12538,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8318,7 +12552,7 @@
  mostlyclean-libtool:
 --- doc/kdict/Makefile.in
 +++ doc/kdict/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8328,7 +12562,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8337,7 +12571,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8349,7 +12583,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -570,7 +573,7 @@
+@@ -582,7 +585,7 @@
  KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2 
  
  #>+ 24
@@ -8358,7 +12592,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
@@ -8384,7 +12618,7 @@
  
 --- doc/kget/Makefile.in
 +++ doc/kget/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8394,7 +12628,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8403,7 +12637,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8415,46 +12649,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -567,10 +570,10 @@
+@@ -579,10 +582,10 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-tool_expert.png kget1.png fileopen.png cr22-action-tool_delay.png Makefile.in cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png kget5.png cr22-action-tool_offline_mode_off.png cr22-action-tool_uselastdir.png kget3.png index.docbook cr22-action-tool_offline_mode_on.png cr22-action-tool_drop_target.png cr22-action-tool_pause.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png Makefile.am kget4.png kget2.png index.cache.bz2 
-+KDE_DIST=fileopen.png kget1.png cr22-action-tool_expert.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png Makefile.in cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png kget5.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png kget3.png index.docbook cr22-action-tool_offline_mode_on.png cr22-action-tool_drop_target.png cr22-action-tool_pause.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png kget4.png Makefile.am kget2.png index.cache.bz2 
+-KDE_DIST=kget1.png fileopen.png Makefile.in kget5.png kget3.png index.docbook Makefile.am kget4.png kget2.png index.cache.bz2 
++KDE_DIST=fileopen.png kget1.png Makefile.in kget5.png kget3.png index.docbook kget4.png Makefile.am kget2.png index.cache.bz2 
  
  #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png 
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
--	@for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
-+	@for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+-	@for base in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++	@for base in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
  	done
  
  uninstall-nls:
--	for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
-+	for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+-	for base in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++	for base in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
  	done
  
  
  #>+ 5
  distdir-nls:
--	for file in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
-+	for file in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+-	for file in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++	for file in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/knewsticker/Makefile.in
 +++ doc/knewsticker/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8464,7 +12698,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8473,7 +12707,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8485,7 +12719,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -567,10 +570,10 @@
+@@ -579,10 +582,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -8498,7 +12732,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
@@ -8524,7 +12758,7 @@
  
 --- doc/kopete/Makefile.in
 +++ doc/kopete/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8534,7 +12768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8543,7 +12777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8555,7 +12789,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -570,7 +573,7 @@
+@@ -582,7 +585,7 @@
  KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -8564,7 +12798,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
@@ -8590,7 +12824,7 @@
  
 --- doc/kpf/Makefile.in
 +++ doc/kpf/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8600,7 +12834,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8609,7 +12843,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8623,7 +12857,7 @@
  mostlyclean-libtool:
 --- doc/kppp/Makefile.in
 +++ doc/kppp/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8633,7 +12867,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8642,7 +12876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8654,7 +12888,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -570,7 +573,7 @@
+@@ -582,7 +585,7 @@
  KDE_DIST=kppp-account-ip-tab.png callback.docbook kppp-faq.docbook kppp-account-login-script-tab.png getting-online.docbook kppp-account-dns-tab.png kppp-misc-tab.png kppp-wizard.png index.docbook kppp-graph-tab.png kppp-modem-tab.png dialog-setup.docbook global-settings.docbook accounting.docbook costsgraphs.png chap.docbook wizard.docbook kppp-account-dial-tab.png ttyS-cua.txt Makefile.in kppp-config.png kppp.faq.question kppp-account-gateway-tab.png tricks.docbook hayes.docbook kppp-dialler-tab.png kppp-device-tab.png security.docbook kppp-account-accounting-tab.png Makefile.am costsgraphs.fig kppp-account-execute-tab.png index.cache.bz2 
  
  #>+ 24
@@ -8663,7 +12897,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
@@ -8689,7 +12923,7 @@
  
 --- doc/krdc/Makefile.in
 +++ doc/krdc/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8699,7 +12933,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8708,7 +12942,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8720,7 +12954,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -567,10 +570,10 @@
+@@ -579,10 +582,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -8733,7 +12967,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
@@ -8759,7 +12993,7 @@
  
 --- doc/krfb/Makefile.in
 +++ doc/krfb/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8769,7 +13003,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8778,7 +13012,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8790,7 +13024,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -567,10 +570,10 @@
+@@ -579,10 +582,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -8803,7 +13037,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -597,20 +600,20 @@
+@@ -609,20 +612,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
@@ -8829,7 +13063,7 @@
  
 --- doc/ksirc/Makefile.in
 +++ doc/ksirc/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8839,7 +13073,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8848,7 +13082,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8862,7 +13096,7 @@
  mostlyclean-libtool:
 --- doc/ktalkd/Makefile.in
 +++ doc/ktalkd/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8872,7 +13106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8881,7 +13115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8895,7 +13129,7 @@
  mostlyclean-libtool:
 --- doc/kwifimanager/Makefile.in
 +++ doc/kwifimanager/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8905,7 +13139,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8914,7 +13148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8928,7 +13162,7 @@
  mostlyclean-libtool:
 --- doc/lisa/Makefile.in
 +++ doc/lisa/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8938,7 +13172,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -8947,7 +13181,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8961,7 +13195,7 @@
  mostlyclean-libtool:
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8971,7 +13205,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,13 +398,13 @@
+@@ -407,13 +410,13 @@
  KDE_DOCS = AUTO
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
@@ -8987,7 +13221,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9001,7 +13235,7 @@
  mostlyclean-libtool:
 --- filesharing/advanced/kcm_sambaconf/Makefile.in
 +++ filesharing/advanced/kcm_sambaconf/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9011,7 +13245,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -527,7 +530,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9020,7 +13254,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -565,9 +568,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9032,7 +13266,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -867,18 +870,18 @@
+@@ -879,18 +882,18 @@
  mocs: kcmsambaconf.moc
  
  #>+ 3
@@ -9057,7 +13291,7 @@
  
  #>+ 3
  hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -947,10 +950,10 @@
+@@ -959,10 +962,10 @@
  
  #>+ 3
  clean-metasources:
@@ -9072,7 +13306,7 @@
  clean-ui:
 --- filesharing/advanced/Makefile.in
 +++ filesharing/advanced/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9082,7 +13316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9091,7 +13325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9105,7 +13339,7 @@
  mostlyclean-libtool:
 --- filesharing/advanced/nfs/Makefile.in
 +++ filesharing/advanced/nfs/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9115,7 +13349,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -447,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9124,7 +13358,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -485,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9138,7 +13372,7 @@
  clean-noinstLTLIBRARIES:
 --- filesharing/advanced/propsdlgplugin/Makefile.in
 +++ filesharing/advanced/propsdlgplugin/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9148,7 +13382,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9157,7 +13391,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9171,7 +13405,7 @@
  	@$(NORMAL_INSTALL)
 --- filesharing/Makefile.in
 +++ filesharing/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9181,7 +13415,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9190,7 +13424,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9204,7 +13438,7 @@
  mostlyclean-libtool:
 --- filesharing/simple/Makefile.in
 +++ filesharing/simple/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -248,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9214,7 +13448,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -469,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9223,7 +13457,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -507,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9237,7 +13471,7 @@
  	@$(NORMAL_INSTALL)
 --- kdict/applet/Makefile.in
 +++ kdict/applet/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9247,7 +13481,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9256,7 +13490,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9270,7 +13504,7 @@
  	@$(NORMAL_INSTALL)
 --- kdict/Makefile.in
 +++ kdict/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -276,6 +276,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9280,7 +13514,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9289,7 +13523,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9299,9 +13533,9 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -941,13 +944,6 @@
+@@ -1051,13 +1054,6 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
  
  #>+ 3
@@ -9315,7 +13549,7 @@
  actions.moc: $(srcdir)/actions.h
  	$(MOC) $(srcdir)/actions.h -o actions.moc
  
-@@ -955,25 +951,18 @@
+@@ -1065,25 +1061,18 @@
  mocs: actions.moc
  
  #>+ 3
@@ -9347,10 +13581,11 @@
  
  #>+ 3
  application.moc: $(srcdir)/application.h
-@@ -997,8 +986,22 @@
+@@ -1106,6 +1095,20 @@
+ #>+ 2
  mocs: dict.moc
  
- #>+ 3
++#>+ 3
 +queryview.moc: $(srcdir)/queryview.h
 +	$(MOC) $(srcdir)/queryview.h -o queryview.moc
 +
@@ -9364,62 +13599,62 @@
 +#>+ 2
 +mocs: toplevel.moc
 +
-+#>+ 3
+ #>+ 8
+ kdict.la.closure: $(kdict_la_OBJECTS) $(kdict_la_DEPENDENCIES)
+ 	@echo "int main() {return 0;}" > kdict_la_closure.cpp
+@@ -1117,10 +1120,10 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  sets.moc actions.moc options.moc queryview.moc toplevel.moc application.moc matchview.moc dict.moc
 +	-rm -f  actions.moc sets.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
  
  #>+ 2
- KDE_DIST=crsc-app-kdict.svgz kdictui.rc cr16-app-kdict.png cr48-app-kdict.png cr32-app-kdict.png dcopinterface.h Makefile.in cr64-app-kdict.png kdict.desktop cr128-app-kdict.png Makefile.am LICENSE 
-@@ -1013,6 +1016,8 @@
+-KDE_DIST=kdictui.rc dcopinterface.h hi128-app-kdict.png hisc-app-kdict.svgz hi48-app-kdict.png Makefile.in hi64-app-kdict.png hi16-app-kdict.png hi32-app-kdict.png kdict.desktop Makefile.am LICENSE 
++KDE_DIST=kdictui.rc dcopinterface.h hi128-app-kdict.png hisc-app-kdict.svgz hi48-app-kdict.png hi64-app-kdict.png Makefile.in hi16-app-kdict.png hi32-app-kdict.png kdict.desktop Makefile.am LICENSE 
  
+ #>+ 4
+ clean-idl:
+@@ -1136,8 +1139,6 @@
+ 
  #>+ 22
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-@@ -1023,16 +1028,14 @@
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdict.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+@@ -1146,15 +1147,17 @@
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdict.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdict.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdict.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdict.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
  
  #>+ 15
- force-reedit:
-@@ -1073,7 +1076,7 @@
+@@ -1196,7 +1199,7 @@
  
  
  #>+ 11
--kdict.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  actions.moc sets.moc options.moc toplevel.moc queryview.moc application.moc matchview.moc dict.moc
-+kdict.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  sets.moc actions.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
- 	@echo 'creating kdict.all_cpp.cpp ...'; \
- 	rm -f kdict.all_cpp.files kdict.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kdict.all_cpp.final; \
-@@ -1120,8 +1123,8 @@
- matchview.lo: matchview.moc 
- actions.lo: actions.moc 
- options.lo: options.moc 
--actions.o: actions.moc 
- toplevel.o: toplevel.moc 
-+actions.o: actions.moc 
- dict.lo: dict.moc 
- nmcheck: 
- queryview.o: queryview.moc 
+-libkdeinit_kdict_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  actions.moc sets.moc options.moc toplevel.moc queryview.moc application.moc matchview.moc dict.moc
++libkdeinit_kdict_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  sets.moc actions.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
+ 	@echo 'creating libkdeinit_kdict_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_kdict_la.all_cpp.files libkdeinit_kdict_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdict_la.all_cpp.final; \
 --- kdict/pics/Makefile.in
 +++ kdict/pics/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9429,7 +13664,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9438,7 +13673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9450,7 +13685,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -572,19 +575,19 @@
+@@ -584,19 +587,19 @@
  
  #>+ 15
  install-kde-icons:
@@ -9475,7 +13710,7 @@
  force-reedit:
 --- kdnssd/ioslave/Makefile.in
 +++ kdnssd/ioslave/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9485,7 +13720,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9494,7 +13729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9506,18 +13741,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -818,7 +821,7 @@
+@@ -830,7 +833,7 @@
  	-rm -f  dnssd.moc
  
  #>+ 2
--KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp dnssd.h CONFIG_FORMAT zeroconf.desktop _http._tcp Makefile.in _nfs._tcp _ldap._tcp _webdav._tcp Makefile.am 
-+KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp CONFIG_FORMAT dnssd.h zeroconf.desktop _http._tcp Makefile.in _nfs._tcp _ldap._tcp _webdav._tcp Makefile.am 
+-KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp dnssd.h CONFIG_FORMAT zeroconf.desktop _http._tcp Makefile.in _nfs._tcp invitation.protocol _ldap._tcp _webdav._tcp Makefile.am 
++KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp CONFIG_FORMAT dnssd.h zeroconf.desktop _http._tcp Makefile.in _nfs._tcp invitation.protocol _ldap._tcp _webdav._tcp Makefile.am 
  
  #>+ 3
  clean-closures:
 --- kdnssd/kdedmodule/Makefile.in
 +++ kdnssd/kdedmodule/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9527,7 +13762,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9536,7 +13771,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9550,7 +13785,7 @@
  	@$(NORMAL_INSTALL)
 --- kdnssd/Makefile.in
 +++ kdnssd/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9560,7 +13795,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9569,7 +13804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9583,7 +13818,7 @@
  mostlyclean-libtool:
 --- kfile-plugins/Makefile.in
 +++ kfile-plugins/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9593,7 +13828,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9602,7 +13837,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9616,7 +13851,7 @@
  mostlyclean-libtool:
 --- kfile-plugins/torrent/Makefile.in
 +++ kfile-plugins/torrent/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9626,7 +13861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -459,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9635,7 +13870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9649,7 +13884,7 @@
  	@$(NORMAL_INSTALL)
 --- kget/icons/Makefile.in
 +++ kget/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9659,7 +13894,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9668,7 +13903,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9680,16 +13915,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,7 +568,7 @@
+@@ -577,7 +580,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png 
-+KDE_DIST=cr22-action-bar6.png cr22-action-kget_dock.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png 
+-KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_uselastdir.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png cr22-action-bar5.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-bar0.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-bar3.png cr22-action-kget_dock_download.png Makefile.in cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png 
++KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_uselastdir.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png cr22-action-bar5.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-bar0.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-bar3.png cr22-action-kget_dock_download.png Makefile.in cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png 
  
  #>+ 2
  docs-am:
-@@ -574,61 +577,61 @@
+@@ -586,59 +589,59 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions
  	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_on.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
@@ -9699,13 +13934,12 @@
  	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_timer.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock_download.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
@@ -9713,24 +13947,24 @@
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock_download.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar2.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar3.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar4.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar5.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-bar6.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
@@ -9743,13 +13977,12 @@
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
- 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
@@ -9757,24 +13990,24 @@
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
  	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
 -	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
 +	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
@@ -9783,7 +14016,7 @@
  force-reedit:
 --- kget/kget_plug_in/Makefile.in
 +++ kget/kget_plug_in/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9793,7 +14026,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -447,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9802,7 +14035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -485,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9816,7 +14049,7 @@
  	@$(NORMAL_INSTALL)
 --- kget/Makefile.in
 +++ kget/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -283,6 +283,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9826,7 +14059,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -524,7 +527,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9835,7 +14068,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9847,7 +14080,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1011,18 +1014,18 @@
+@@ -1071,18 +1074,18 @@
  mocs: dlgAdvanced.moc
  
  #>+ 3
@@ -9872,7 +14105,7 @@
  
  #>+ 3
  slave.moc: $(srcdir)/slave.h
-@@ -1053,18 +1056,18 @@
+@@ -1113,18 +1116,18 @@
  mocs: dlgSystem.moc
  
  #>+ 3
@@ -9897,7 +14130,7 @@
  
  #>+ 3
  droptarget.moc: $(srcdir)/droptarget.h
-@@ -1103,7 +1106,7 @@
+@@ -1163,7 +1166,7 @@
  
  #>+ 3
  clean-metasources:
@@ -9905,10 +14138,54 @@
 +	-rm -f  dockindividual.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
  
  #>+ 2
- KDE_DIST=kgetui.rc dlglimitsbase.ui dlgadvancedbase.ui Makefile.in dlgsystembase.ui x-kgetlist.desktop safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr48-mime-kget_list.png Makefile.am kget_iface.h cr48-app-kget.png 
-@@ -1176,7 +1179,7 @@
+ KDE_DIST=cr32-mime-kget_list.png dlglimitsbase.ui eventsrc dlgadvancedbase.ui dlgsystembase.ui safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr16-mime-kget_list.png cr48-app-kget.png cr16-app-kget.png kgetui.rc cr22-app-kget.png cr22-mime-kget_list.png kget_download.desktop Makefile.in x-kgetlist.desktop cr32-app-kget.png cr48-mime-kget_list.png Makefile.am kget_iface.h 
+@@ -1188,31 +1191,31 @@
  
+ #>+ 28
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kget.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kget.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr32-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kget_list.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
++	$(INSTALL_DATA) $(srcdir)/cr48-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr16-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
  
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kget.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kget.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kget_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
+ 
+ #>+ 15
+@@ -1254,7 +1257,7 @@
+ 
+ 
  #>+ 11
 -kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp  dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
 +kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp  dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
@@ -9917,7 +14194,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
 --- kget/pics/Makefile.in
 +++ kget/pics/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9927,7 +14204,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -411,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9936,7 +14213,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -449,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9948,18 +14225,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -598,7 +601,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=connect1.png try5.png try3.png md_finished.png connect5.png try6.png connect2.png connect3.png try0.png try7.png Makefile.in md_queued.png connect0.png connect4.png retrying.png md_scheduled.png try4.png try2.png connect6.png md_delayed.png target.png connect7.png try1.png Makefile.am 
-+KDE_DIST=connect1.png try5.png try3.png md_finished.png connect5.png try6.png connect2.png connect3.png try0.png try7.png Makefile.in connect0.png md_queued.png connect4.png retrying.png md_scheduled.png try4.png try2.png connect6.png md_delayed.png target.png connect7.png try1.png Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kget/sounds/Makefile.in
 +++ kget/sounds/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9969,7 +14237,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -406,7 +409,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9978,7 +14246,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -444,9 +447,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9992,7 +14260,7 @@
  mostlyclean-libtool:
 --- knewsticker/common/Makefile.in
 +++ knewsticker/common/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10002,7 +14270,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -450,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10011,7 +14279,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -488,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10025,7 +14293,7 @@
  clean-noinstLTLIBRARIES:
 --- knewsticker/knewstickerstub/Makefile.in
 +++ knewsticker/knewstickerstub/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -240,6 +240,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10035,7 +14303,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10044,7 +14312,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10058,7 +14326,7 @@
  	@$(NORMAL_INSTALL)
 --- knewsticker/kntsrcfilepropsdlg/Makefile.in
 +++ knewsticker/kntsrcfilepropsdlg/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -244,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10068,7 +14336,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -454,7 +457,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10077,7 +14345,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -492,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10091,7 +14359,7 @@
  	@$(NORMAL_INSTALL)
 --- knewsticker/Makefile.in
 +++ knewsticker/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -272,6 +272,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10101,7 +14369,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10110,7 +14378,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10122,7 +14390,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1020,18 +1023,18 @@
+@@ -1032,18 +1035,18 @@
  mocs: newsscroller.moc
  
  #>+ 3
@@ -10147,7 +14415,7 @@
  
  #>+ 3
  newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1042,10 +1045,10 @@
+@@ -1054,10 +1057,10 @@
  
  #>+ 3
  clean-metasources:
@@ -10155,33 +14423,33 @@
 +	-rm -f  newsscroller.moc knewsticker.moc knewstickerconfig.moc newssourcedlgimpl.moc
  
  #>+ 2
--KDE_DIST=knewstickerconfigwidget.ui newssourcedlg.ui knewsticker-standalone.desktop eventsrc cr48-app-knewsticker.png cr32-app-knewsticker.png Makefile.in knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h Makefile.am knewsticker.upd cr16-app-knewsticker.png newssourcedlgimpl.h 
-+KDE_DIST=knewstickerconfigwidget.ui newssourcedlg.ui knewsticker-standalone.desktop eventsrc cr48-app-knewsticker.png cr32-app-knewsticker.png Makefile.in knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h Makefile.am knewsticker.upd newssourcedlgimpl.h cr16-app-knewsticker.png 
+-KDE_DIST=knewstickerconfigwidget.ui knewsticker-standalone.desktop eventsrc knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h knewsticker.upd hi16-app-knewsticker.png newssourcedlg.ui Makefile.in hi32-app-knewsticker.png Makefile.am hi48-app-knewsticker.png newssourcedlgimpl.h 
++KDE_DIST=knewstickerconfigwidget.ui knewsticker-standalone.desktop eventsrc knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h knewsticker.upd hi16-app-knewsticker.png newssourcedlg.ui Makefile.in hi32-app-knewsticker.png Makefile.am newssourcedlgimpl.h hi48-app-knewsticker.png 
  
  #>+ 4
  clean-idl:
-@@ -1067,17 +1070,17 @@
+@@ -1079,17 +1082,17 @@
  
  #>+ 13
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knewsticker.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knewsticker.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knewsticker.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knewsticker.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knewsticker.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knewsticker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knewsticker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knewsticker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
  
  #>+ 15
  force-reedit:
-@@ -1118,7 +1121,7 @@
+@@ -1130,7 +1133,7 @@
  
  
  #>+ 11
@@ -10192,7 +14460,7 @@
  	echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
 --- kopete/icons/Makefile.in
 +++ kopete/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10202,7 +14470,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10211,7 +14479,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10223,17 +14491,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,104 +568,104 @@
+@@ -577,116 +580,116 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=hi16-action-emoticon.png cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png cr16-action-kopeteavailable.png hi32-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr32-action-account_offline_overlay.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png cr22-action-kopeteavailable.png hi16-action-newmsg.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi16-action-kopeteaway.png cr22-action-account_offline_overlay.png hi22-action-kopeteavailable.png hi16-action-status_unknown.png hi48-action-kopeteaway.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-kopeteaway.png cr16-action-metacontact_away.png cr48-action-kopeteaway.png cr16-action-emoticon.png cr48-action-kopeteavailable.png cr16-action-account_offline_overlay.png hi32-action-newmessage.mng Makefile.am cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi32-action-kopeteaway.png 
-+KDE_DIST=hi16-action-emoticon.png cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png cr16-action-kopeteavailable.png hi32-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr32-action-newmsg.png cr32-action-account_offline_overlay.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png hi16-action-newmsg.png cr22-action-kopeteavailable.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi16-action-kopeteaway.png hi22-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi48-action-kopeteaway.png hi16-action-status_unknown.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-kopeteaway.png cr16-action-metacontact_away.png cr48-action-kopeteaway.png cr16-action-emoticon.png cr48-action-kopeteavailable.png cr16-action-account_offline_overlay.png hi32-action-newmessage.mng Makefile.am cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi32-action-kopeteaway.png 
+-KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-account_offline_overlay.png hi16-action-kopeteaway.png cr16-action-contact_xa_overlay.png cr16-action-contact_busy_overlay.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-metacontact_away.png cr16-action-emoticon.png cr48-action-kopeteavailable.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr16-action-contact_food_overlay.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png cr22-action-kopeteavailable.png hi16-action-newmsg.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi22-action-kopeteavailable.png hi16-action-status_unknown.png hi48-action-kopeteaway.png cr16-action-contact_invisible_overlay.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am hi32-action-kopeteaway.png 
++KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-account_offline_overlay.png hi16-action-kopeteaway.png cr16-action-contact_xa_overlay.png cr16-action-contact_busy_overlay.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-metacontact_away.png cr16-action-emoticon.png cr48-action-kopeteavailable.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr16-action-contact_food_overlay.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png hi16-action-newmsg.png cr22-action-kopeteavailable.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi22-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi48-action-kopeteaway.png hi16-action-status_unknown.png cr16-action-contact_invisible_overlay.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am hi32-action-kopeteaway.png 
  
  #>+ 2
  docs-am:
  
- #>+ 93
+ #>+ 105
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
@@ -10252,12 +14520,15 @@
  	$(INSTALL_DATA) $(srcdir)/cr16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
 -	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
  	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions
  	$(INSTALL_DATA) $(srcdir)/hi32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
@@ -10266,16 +14537,21 @@
 -	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
 -	$(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
 -	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
 -	$(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
 -	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
 +	$(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
  	$(INSTALL_DATA) $(srcdir)/hi32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
@@ -10286,12 +14562,12 @@
 +	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
 -	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
 +	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
 +	$(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
  	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
 -	$(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
@@ -10299,6 +14575,7 @@
 +	$(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
@@ -10306,14 +14583,17 @@
 +	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
  	$(INSTALL_DATA) $(srcdir)/hi32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
  	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
 -	$(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
 +	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
@@ -10329,25 +14609,33 @@
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
@@ -10357,11 +14645,11 @@
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
@@ -10369,29 +14657,66 @@
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
  
  #>+ 15
  force-reedit:
+--- kopete/kopete/addaccountwizard/Makefile.in
++++ kopete/kopete/addaccountwizard/Makefile.in
+@@ -235,6 +235,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -443,7 +446,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*) \
+@@ -481,9 +484,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
 --- kopete/kopete/addcontactwizard/Makefile.in
 +++ kopete/kopete/addcontactwizard/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10401,7 +14726,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10410,7 +14735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10424,7 +14749,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/kopete/chatwindow/Makefile.in
 +++ kopete/kopete/chatwindow/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -276,6 +276,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10434,7 +14759,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -499,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10443,7 +14768,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -537,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10455,7 +14780,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -910,11 +913,11 @@
+@@ -922,11 +925,11 @@
  mocs: kopeteemailwindow.moc
  
  #>+ 3
@@ -10470,7 +14795,7 @@
  
  #>+ 3
  kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -924,11 +927,11 @@
+@@ -936,11 +939,11 @@
  mocs: kopetechatwindow.moc
  
  #>+ 3
@@ -10485,7 +14810,7 @@
  
  #>+ 8
  kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -950,7 +953,7 @@
+@@ -962,7 +965,7 @@
  
  #>+ 3
  clean-metasources:
@@ -10493,8 +14818,8 @@
 +	-rm -f  krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc kopeteemoticonaction.moc kopetechatwindow.moc chatmemberslistwidget.moc
  
  #>+ 2
- KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h krichtexteditpart.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc chatmessagepart.h kopeteemailwindow.h Makefile.am 
-@@ -1001,7 +1004,7 @@
+ KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h krichtexteditpart.h chatmessagepart.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc kopeteemailwindow.h Makefile.am 
+@@ -1013,7 +1016,7 @@
  
  
  #>+ 11
@@ -10505,7 +14830,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
 --- kopete/kopete/config/accounts/Makefile.in
 +++ kopete/kopete/config/accounts/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -246,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10515,7 +14840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -457,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10524,7 +14849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -495,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10536,18 +14861,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -791,7 +794,7 @@
- 	-rm -f  addaccountwizard.moc kopeteaccountconfig.moc
- 
- #>+ 2
--KDE_DIST=kopeteaccountconfig.h addaccountwizardpage3.ui kopete_accountconfig.desktop addaccountwizardpage1.ui Makefile.in kopeteaccountconfigbase.ui Makefile.am addaccountwizard.h addaccountwizardpage2.ui 
-+KDE_DIST=kopeteaccountconfig.h addaccountwizardpage3.ui kopete_accountconfig.desktop addaccountwizardpage1.ui Makefile.in kopeteaccountconfigbase.ui Makefile.am addaccountwizardpage2.ui addaccountwizard.h 
- 
- #>+ 7
- clean-ui:
 --- kopete/kopete/config/appearance/Makefile.in
 +++ kopete/kopete/config/appearance/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10557,7 +14873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -468,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10566,7 +14882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -506,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10578,18 +14894,69 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -798,7 +801,7 @@
- 	-rm -f  tooltipeditdialog.moc appearanceconfig.moc
+--- kopete/kopete/config/avdevice/Makefile.in
++++ kopete/kopete/config/avdevice/Makefile.in
+@@ -250,6 +250,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -473,7 +476,7 @@
  
- #>+ 2
--KDE_DIST=kopete_appearanceconfig.desktop tooltipeditwidget.ui appearanceconfig.h appearanceconfig_emoticons.ui Makefile.in appearanceconfig_colors.ui tooltipeditdialog.h appearanceconfig_contactlist.ui appearanceconfig_chatwindow.ui Makefile.am 
-+KDE_DIST=kopete_appearanceconfig.desktop tooltipeditwidget.ui appearanceconfig_emoticons.ui appearanceconfig.h Makefile.in appearanceconfig_colors.ui tooltipeditdialog.h appearanceconfig_contactlist.ui Makefile.am appearanceconfig_chatwindow.ui 
+ .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*) \
+@@ -511,9 +514,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- #>+ 8
- clean-ui:
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -829,20 +832,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/kopete_avdevice.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/kopete_avdevice.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/kopete_avdevice.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/kopete_avdevice.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ 
+ #>+ 15
+ force-reedit:
 --- kopete/kopete/config/behavior/Makefile.in
 +++ kopete/kopete/config/behavior/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10599,7 +14966,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -461,7 +464,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10608,7 +14975,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -499,9 +502,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10620,9 +14987,90 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -800,7 +803,7 @@
+ 	-rm -f  behaviorconfig.moc
+ 
+ #>+ 2
+-KDE_DIST=behaviorconfig.h kopeteawayconfigbase.ui kopete_behaviorconfig.desktop Makefile.in behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig_chat.ui Makefile.am 
++KDE_DIST=behaviorconfig.h kopeteawayconfigbase.ui kopete_behaviorconfig.desktop Makefile.in behaviorconfig_general.ui behaviorconfig_chat.ui behaviorconfig_events.ui Makefile.am 
+ 
+ #>+ 7
+ clean-ui:
+--- kopete/kopete/config/identity/Makefile.in
++++ kopete/kopete/config/identity/Makefile.in
+@@ -248,6 +248,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -463,7 +466,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*) \
+@@ -501,9 +504,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -809,22 +812,22 @@
+ 
+ 
+ #>+ 3
+-kopeteidentityconfig.moc: $(srcdir)/kopeteidentityconfig.h
+-	$(MOC) $(srcdir)/kopeteidentityconfig.h -o kopeteidentityconfig.moc
++globalidentitiesmanager.moc: $(srcdir)/globalidentitiesmanager.h
++	$(MOC) $(srcdir)/globalidentitiesmanager.h -o globalidentitiesmanager.moc
+ 
+ #>+ 2
+-mocs: kopeteidentityconfig.moc
++mocs: globalidentitiesmanager.moc
+ 
+ #>+ 3
+-globalidentitiesmanager.moc: $(srcdir)/globalidentitiesmanager.h
+-	$(MOC) $(srcdir)/globalidentitiesmanager.h -o globalidentitiesmanager.moc
++kopeteidentityconfig.moc: $(srcdir)/kopeteidentityconfig.h
++	$(MOC) $(srcdir)/kopeteidentityconfig.h -o kopeteidentityconfig.moc
+ 
+ #>+ 2
+-mocs: globalidentitiesmanager.moc
++mocs: kopeteidentityconfig.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kopeteidentityconfig.moc globalidentitiesmanager.moc
++	-rm -f  globalidentitiesmanager.moc kopeteidentityconfig.moc
+ 
+ #>+ 2
+ KDE_DIST=globalidentitiesmanager.h kopeteidentityconfigbase.ui kopeteidentityconfigpreferences.kcfgc kopeteidentityconfig.h kopeteidentityconfigpreferences.kcfg Makefile.in kopete_identityconfig.desktop Makefile.am 
+@@ -885,7 +888,7 @@
+ 
+ 
+ #>+ 11
+-kcm_kopete_identityconfig_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kopeteidentityconfig.cpp $(srcdir)/globalidentitiesmanager.cpp kopeteidentityconfigbase.cpp kopeteidentityconfigpreferences.cpp  kopeteidentityconfigbase.moc globalidentitiesmanager.moc kopeteidentityconfig.moc
++kcm_kopete_identityconfig_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kopeteidentityconfig.cpp $(srcdir)/globalidentitiesmanager.cpp kopeteidentityconfigbase.cpp kopeteidentityconfigpreferences.cpp  kopeteidentityconfigbase.moc kopeteidentityconfig.moc globalidentitiesmanager.moc
+ 	@echo 'creating kcm_kopete_identityconfig_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_kopete_identityconfig_la.all_cpp.files kcm_kopete_identityconfig_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_kopete_identityconfig_la.all_cpp.final; \
 --- kopete/kopete/config/Makefile.in
 +++ kopete/kopete/config/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10632,7 +15080,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -10641,7 +15089,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10655,7 +15103,7 @@
  mostlyclean-libtool:
 --- kopete/kopete/config/plugins/Makefile.in
 +++ kopete/kopete/config/plugins/Makefile.in
-@@ -221,6 +221,9 @@
+@@ -228,6 +228,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10665,7 +15113,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -431,7 +434,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10674,7 +15122,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10688,7 +15136,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/kopete/contactlist/Makefile.in
 +++ kopete/kopete/contactlist/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10698,7 +15146,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -467,7 +470,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10707,7 +15155,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -505,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10719,47 +15167,72 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -758,18 +761,18 @@
- mocs: customnotificationprops.moc
+@@ -746,18 +749,18 @@
+ .NOEXPORT:
  
  #>+ 3
--kopetecontactlistview.moc: $(srcdir)/kopetecontactlistview.h
--	$(MOC) $(srcdir)/kopetecontactlistview.h -o kopetecontactlistview.moc
-+kopetelviprops.moc: $(srcdir)/kopetelviprops.h
-+	$(MOC) $(srcdir)/kopetelviprops.h -o kopetelviprops.moc
+-customnotificationprops.moc: $(srcdir)/customnotificationprops.h
+-	$(MOC) $(srcdir)/customnotificationprops.h -o customnotificationprops.moc
++kopetegrouplistaction.moc: $(srcdir)/kopetegrouplistaction.h
++	$(MOC) $(srcdir)/kopetegrouplistaction.h -o kopetegrouplistaction.moc
  
  #>+ 2
--mocs: kopetecontactlistview.moc
-+mocs: kopetelviprops.moc
+-mocs: customnotificationprops.moc
++mocs: kopetegrouplistaction.moc
  
  #>+ 3
--kopetelviprops.moc: $(srcdir)/kopetelviprops.h
--	$(MOC) $(srcdir)/kopetelviprops.h -o kopetelviprops.moc
-+kopetecontactlistview.moc: $(srcdir)/kopetecontactlistview.h
-+	$(MOC) $(srcdir)/kopetecontactlistview.h -o kopetecontactlistview.moc
+-kopetegrouplistaction.moc: $(srcdir)/kopetegrouplistaction.h
+-	$(MOC) $(srcdir)/kopetegrouplistaction.h -o kopetegrouplistaction.moc
++customnotificationprops.moc: $(srcdir)/customnotificationprops.h
++	$(MOC) $(srcdir)/customnotificationprops.h -o customnotificationprops.moc
  
  #>+ 2
--mocs: kopetelviprops.moc
-+mocs: kopetecontactlistview.moc
+-mocs: kopetegrouplistaction.moc
++mocs: customnotificationprops.moc
  
  #>+ 3
- kopetelistview.moc: $(srcdir)/kopetelistview.h
-@@ -822,10 +825,10 @@
+ kopetelviprops.moc: $(srcdir)/kopetelviprops.h
+@@ -774,18 +777,18 @@
+ mocs: kopetecontactlistview.moc
  
  #>+ 3
+-kopetemetacontactlvi.moc: $(srcdir)/kopetemetacontactlvi.h
+-	$(MOC) $(srcdir)/kopetemetacontactlvi.h -o kopetemetacontactlvi.moc
++kopetegroupviewitem.moc: $(srcdir)/kopetegroupviewitem.h
++	$(MOC) $(srcdir)/kopetegroupviewitem.h -o kopetegroupviewitem.moc
+ 
+ #>+ 2
+-mocs: kopetemetacontactlvi.moc
++mocs: kopetegroupviewitem.moc
+ 
+ #>+ 3
+-kopetegroupviewitem.moc: $(srcdir)/kopetegroupviewitem.h
+-	$(MOC) $(srcdir)/kopetegroupviewitem.h -o kopetegroupviewitem.moc
++kopetemetacontactlvi.moc: $(srcdir)/kopetemetacontactlvi.h
++	$(MOC) $(srcdir)/kopetemetacontactlvi.h -o kopetemetacontactlvi.moc
+ 
+ #>+ 2
+-mocs: kopetegroupviewitem.moc
++mocs: kopetemetacontactlvi.moc
+ 
+ #>+ 3
+ kabcexport.moc: $(srcdir)/kabcexport.h
+@@ -796,10 +799,10 @@
+ 
+ #>+ 3
  clean-metasources:
--	-rm -f  kopetegrouplistaction.moc customnotificationprops.moc kopetecontactlistview.moc kopetelviprops.moc kopetelistview.moc kabcexport.moc linkaddressbookui.moc kopetelistviewitem.moc kopetelistviewsearchline.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc
-+	-rm -f  kopetegrouplistaction.moc customnotificationprops.moc kopetelviprops.moc kopetecontactlistview.moc kopetelistview.moc kabcexport.moc linkaddressbookui.moc kopetelistviewitem.moc kopetelistviewsearchline.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc
+-	-rm -f  customnotificationprops.moc kopetegrouplistaction.moc kopetelviprops.moc kopetecontactlistview.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc kabcexport.moc
++	-rm -f  kopetegrouplistaction.moc customnotificationprops.moc kopetelviprops.moc kopetecontactlistview.moc kopetegroupviewitem.moc kopetemetacontactlvi.moc kabcexport.moc
  
  #>+ 2
--KDE_DIST=kopetelviprops.h kopetecontactlistview.h kopetegrouplistaction.h linkaddressbookui_base.ui configure.in.in kopetegroupviewitem.h kopetestatusgroupviewitem.h customnotifications.ui Makefile.in kopetelistview.h kopetemetalvipropswidget.ui kopetemetacontactlvi.h kopetegvipropswidget.ui kabcexport_base.ui kopeteaddrbookexportui.ui Makefile.am kopetelistviewsearchline.h kopetelistviewitem.h 
-+KDE_DIST=kopetelviprops.h kopetecontactlistview.h kopetegrouplistaction.h linkaddressbookui_base.ui configure.in.in kopetegroupviewitem.h customnotifications.ui kopetestatusgroupviewitem.h Makefile.in kopetelistview.h kopetemetalvipropswidget.ui kopetegvipropswidget.ui kopetemetacontactlvi.h kabcexport_base.ui kopeteaddrbookexportui.ui Makefile.am kopetelistviewsearchline.h kopetelistviewitem.h 
+-KDE_DIST=kopetelviprops.h kopetegrouplistaction.h kopetestatusgroupviewitem.h kopetemetacontactlvi.h kopetegvipropswidget.ui kabcexport_base.ui kopeteaddrbookexportui.ui kopetecontactlistview.h configure.in.in kopetegroupviewitem.h customnotifications.ui Makefile.in kopetemetalvipropswidget.ui Makefile.am 
++KDE_DIST=kopetelviprops.h kopetegrouplistaction.h kopetestatusgroupviewitem.h kopetegvipropswidget.ui kopetemetacontactlvi.h kabcexport_base.ui kopeteaddrbookexportui.ui kopetecontactlistview.h configure.in.in kopetegroupviewitem.h customnotifications.ui Makefile.in kopetemetalvipropswidget.ui Makefile.am 
  
- #>+ 9
+ #>+ 8
  clean-ui:
 --- kopete/kopete/kconf_update/Makefile.in
 +++ kopete/kopete/kconf_update/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10769,7 +15242,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10778,7 +15251,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10792,7 +15265,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/kopete/Makefile.in
 +++ kopete/kopete/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10802,7 +15275,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -519,7 +522,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10811,7 +15284,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -557,9 +560,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10823,7 +15296,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -999,18 +1002,18 @@
+@@ -1007,18 +1010,18 @@
  mocs: kopetewindow.moc
  
  #>+ 3
@@ -10847,97 +15320,130 @@
 +mocs: kopeteapplication.moc
  
  #>+ 3
- systemtray.moc: $(srcdir)/systemtray.h
-@@ -1028,10 +1031,10 @@
+ kopeteeditglobalidentitywidget.moc: $(srcdir)/kopeteeditglobalidentitywidget.h
+@@ -1043,10 +1046,10 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  kopeteglobalawaydialog.moc kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc systemtray.moc kopeteaccountstatusbaricon.moc
-+	-rm -f  kopeteglobalawaydialog.moc kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc systemtray.moc kopeteaccountstatusbaricon.moc
+-	-rm -f  kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
++	-rm -f  kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
  
  #>+ 2
--KDE_DIST=systemtray.h kopeteapplication.h kopetewindow.h kopete.desktop kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc cr22-app-kopete_offline.png kimiface.h crsc-app-kopete2.svgz cr64-app-kopete.png cr16-app-kopete.png cr22-app-kopete_all_away.png kopeteiface.h kopeteglobalawaydialog.h Makefile.in x-kopete-emoticons.desktop cr16-mime-kopete_emoticons.png cr48-app-kopete.png kopeteui.rc kopeteballoon.h cr22-app-kopete.png cr32-app-kopete.png cr22-app-kopete_some_away.png kopeteglobalawaydialog.cpp Makefile.am cr128-app-kopete.png cr22-mime-kopete_emoticons.png 
-+KDE_DIST=systemtray.h kopeteapplication.h kopetewindow.h kopete.desktop kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc cr22-app-kopete_offline.png kimiface.h crsc-app-kopete2.svgz cr64-app-kopete.png cr16-app-kopete.png cr22-app-kopete_all_away.png kopeteiface.h kopeteglobalawaydialog.h x-kopete-emoticons.desktop cr16-mime-kopete_emoticons.png Makefile.in cr48-app-kopete.png kopeteui.rc kopeteballoon.h cr22-app-kopete.png cr32-app-kopete.png kopeteglobalawaydialog.cpp cr22-app-kopete_some_away.png cr128-app-kopete.png Makefile.am cr22-mime-kopete_emoticons.png 
+-KDE_DIST=hi32-app-kopete.png kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png hi22-app-kopete.png eventsrc kimiface.h cr22-app-kopete_all_away.png cr16-mime-kopete_emoticons.png cr22-app-kopete_some_away.png hi48-app-kopete.png cr22-mime-kopete_emoticons.png systemtray.h kopeteapplication.h kopetewindow.h kopeteeditglobalidentitywidget.h kopete.desktop cr22-app-kopete_offline.png hi128-app-kopete.png kopeteiface.h Makefile.in x-kopete-emoticons.desktop hisc-app-kopete2.svgz hi64-app-kopete.png kopeteballoon.h kopeteui.rc hi16-app-kopete.png Makefile.am 
++KDE_DIST=hi32-app-kopete.png kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc hi22-app-kopete.png kimiface.h cr22-app-kopete_all_away.png cr16-mime-kopete_emoticons.png cr22-app-kopete_some_away.png cr22-mime-kopete_emoticons.png hi48-app-kopete.png systemtray.h kopeteapplication.h kopetewindow.h kopeteeditglobalidentitywidget.h kopete.desktop cr22-app-kopete_offline.png hi128-app-kopete.png kopeteiface.h x-kopete-emoticons.desktop Makefile.in hisc-app-kopete2.svgz hi64-app-kopete.png kopeteui.rc kopeteballoon.h hi16-app-kopete.png Makefile.am 
  
  #>+ 5
  clean-idl:
-@@ -1044,43 +1047,43 @@
- 
- #>+ 39
+@@ -1060,43 +1063,43 @@
+ #>+ 40
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kopete.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kopete2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kopete2.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-kopete2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kopete2.svgz
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
 +	$(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kopete.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kopete.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
++	$(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kopete.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kopete2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kopete2.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kopete.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kopete.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kopete.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
  
  #>+ 15
  force-reedit:
-@@ -1121,7 +1124,7 @@
+@@ -1137,7 +1140,7 @@
  
  
  #>+ 11
--kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc systemtray.moc kopeteaccountstatusbaricon.moc
-+kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc systemtray.moc kopeteaccountstatusbaricon.moc
+-kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp $(srcdir)/kopeteeditglobalidentitywidget.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
++kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp $(srcdir)/kopeteeditglobalidentitywidget.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
  	@echo 'creating kopete.all_cpp.cpp ...'; \
  	rm -f kopete.all_cpp.files kopete.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
+--- kopete/libkopete/avdevice/Makefile.in
++++ kopete/libkopete/avdevice/Makefile.in
+@@ -255,6 +255,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -472,7 +475,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*) \
+@@ -510,9 +513,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kopete/libkopete/Makefile.in
 +++ kopete/libkopete/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -312,6 +312,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10947,7 +15453,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10956,7 +15462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10968,7 +15474,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1264,18 +1267,18 @@
+@@ -1226,18 +1229,18 @@
  mocs: kopeteaccount.moc
  
  #>+ 3
@@ -10993,7 +15499,7 @@
  
  #>+ 3
  kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1292,18 +1295,18 @@
+@@ -1254,18 +1257,18 @@
  mocs: kopetecommandhandler.moc
  
  #>+ 3
@@ -11018,7 +15524,7 @@
  
  #>+ 3
  kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1397,18 +1400,18 @@
+@@ -1373,18 +1376,18 @@
  mocs: kopeteplugin.moc
  
  #>+ 3
@@ -11043,52 +15549,27 @@
  
  #>+ 3
  kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1453,18 +1456,18 @@
- mocs: kopeteonlinestatusmanager.moc
+@@ -1451,7 +1454,7 @@
  
  #>+ 3
--kopetemessagemanagerfactory.moc: $(srcdir)/kopetemessagemanagerfactory.h
--	$(MOC) $(srcdir)/kopetemessagemanagerfactory.h -o kopetemessagemanagerfactory.moc
-+kopetemessageevent.moc: $(srcdir)/kopetemessageevent.h
-+	$(MOC) $(srcdir)/kopetemessageevent.h -o kopetemessageevent.moc
- 
- #>+ 2
--mocs: kopetemessagemanagerfactory.moc
-+mocs: kopetemessageevent.moc
- 
- #>+ 3
--kopetemessageevent.moc: $(srcdir)/kopetemessageevent.h
--	$(MOC) $(srcdir)/kopetemessageevent.h -o kopetemessageevent.moc
-+kopetemessagemanagerfactory.moc: $(srcdir)/kopetemessagemanagerfactory.h
-+	$(MOC) $(srcdir)/kopetemessagemanagerfactory.h -o kopetemessagemanagerfactory.moc
- 
- #>+ 2
--mocs: kopetemessageevent.moc
-+mocs: kopetemessagemanagerfactory.moc
- 
- #>+ 3
- kopetemessagemanager.moc: $(srcdir)/kopetemessagemanager.h
-@@ -1482,7 +1485,7 @@
- 
- #>+ 3
  clean-metasources:
--	-rm -f  kopetexsl.moc kopeteaccount.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessagemanagerfactory.moc kopetemessageevent.moc kopetemessagemanager.moc kopetemetacontact.moc
-+	-rm -f  kopetexsl.moc kopeteaccount.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemessagemanagerfactory.moc kopetemessagemanager.moc kopetemetacontact.moc
+-	-rm -f  kopetexsl.moc kopeteaccount.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetechatsessionmanager.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetechatsession.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc knotification.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemetacontact.moc
++	-rm -f  kopetexsl.moc kopeteaccount.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetechatsessionmanager.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetechatsession.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc knotification.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemetacontact.moc
  
  #>+ 2
- KDE_DIST=connectionmanager.h PORTING kopetenotifyevent.h API-TODO kautoconfig.h kopetewalletmanager.h clientiface.h kopeteui.desktop kopetepluginmanager.h kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp 
-@@ -1539,7 +1542,7 @@
+ KDE_DIST=connectionmanager.h PORTING kopetemessagemanagerfactory.h kopetenotifyevent.h API-TODO kopeteconfig.kcfgc kautoconfig.h kopetewalletmanager.h clientiface.h kopetemessagemanager.h kopeteutils.h kopeteui.desktop kopetepluginmanager.h kopete.kcfg kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h knotification.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp 
+@@ -1513,7 +1516,7 @@
  
  
  #>+ 11
--libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetemessagemanager.cpp $(srcdir)/kopetemessagemanagerfactory.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopetenotifyclient.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp connectionmanager_skel.cpp clientiface_stub.cpp  kopeteaccount.moc kopetexsl.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessagemanagerfactory.moc kopetemessageevent.moc kopetemessagemanager.moc kopetemetacontact.moc
-+libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetemessagemanager.cpp $(srcdir)/kopetemessagemanagerfactory.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopetenotifyclient.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp connectionmanager_skel.cpp clientiface_stub.cpp  kopeteaccount.moc kopetexsl.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemessagemanagerfactory.moc kopetemessagemanager.moc kopetemetacontact.moc
+-libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotification.cpp $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetechatsession.cpp $(srcdir)/kopetechatsessionmanager.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp $(srcdir)/kopeteutils.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp  kopeteaccount.moc kopetexsl.moc kopetecontact.moc kopetewalletmanager.moc connectionmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopetechatsession.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopeteplugin.moc kopetepluginmanager.moc kopeteawayaction.moc kopetecontactlist.moc kautoconfig.moc knotification.moc kopetetransfermanager.moc kopeteblacklister.moc kopetetask.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetechatsessionmanager.moc kopetemetacontact.moc kopetemessagehandler.moc
++libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotification.cpp $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetechatsession.cpp $(srcdir)/kopetechatsessionmanager.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp $(srcdir)/kopeteutils.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp  kopeteaccount.moc kopetexsl.moc kopetewalletmanager.moc kopetecontact.moc connectionmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopetechatsession.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopeteplugin.moc kopeteawayaction.moc kopetepluginmanager.moc kopetecontactlist.moc kautoconfig.moc knotification.moc kopetetransfermanager.moc kopeteblacklister.moc kopetetask.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetechatsessionmanager.moc kopetemetacontact.moc kopetemessagehandler.moc
  	@echo 'creating libkopete_la.all_cpp.cpp ...'; \
  	rm -f libkopete_la.all_cpp.files libkopete_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
 --- kopete/libkopete/private/Makefile.in
 +++ kopete/libkopete/private/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11098,7 +15579,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -439,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11107,7 +15588,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11119,18 +15600,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -732,7 +735,7 @@
- 	-rm -f  kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc
+@@ -752,7 +755,7 @@
+ 	-rm -f  kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc kopeteutils_private.moc
  
  #>+ 2
--KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h Makefile.in Makefile.am kopeteviewmanager.h 
-+KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h Makefile.in kopeteviewmanager.h Makefile.am 
+-KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h kopeteutils_private.h Makefile.in Makefile.am kopeteviewmanager.h 
++KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h kopeteutils_private.h Makefile.in kopeteviewmanager.h Makefile.am 
  
  #>+ 2
  docs-am:
 --- kopete/libkopete/tests/Makefile.in
 +++ kopete/libkopete/tests/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -304,6 +304,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11140,7 +15621,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -530,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11149,7 +15630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -568,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11160,10 +15641,43 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-checkPROGRAMS:
+ clean-checkLTLIBRARIES:
+--- kopete/libkopete/tests/mock/Makefile.in
++++ kopete/libkopete/tests/mock/Makefile.in
+@@ -239,6 +239,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -445,7 +448,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -483,9 +486,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
 --- kopete/libkopete/ui/Makefile.in
 +++ kopete/libkopete/ui/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -257,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11173,7 +15687,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -487,7 +490,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11182,7 +15696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -525,9 +528,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11194,39 +15708,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -796,22 +799,22 @@
- mocs: kopetestdaction.moc
+@@ -859,18 +862,18 @@
+ mocs: kopetelistviewitem.moc
  
  #>+ 3
--kopetepasswordwidget.moc: $(srcdir)/kopetepasswordwidget.h
--	$(MOC) $(srcdir)/kopetepasswordwidget.h -o kopetepasswordwidget.moc
-+accountselector.moc: $(srcdir)/accountselector.h
-+	$(MOC) $(srcdir)/accountselector.h -o accountselector.moc
+-kopetelistviewsearchline.moc: $(srcdir)/kopetelistviewsearchline.h
+-	$(MOC) $(srcdir)/kopetelistviewsearchline.h -o kopetelistviewsearchline.moc
++metacontactselectorwidget.moc: $(srcdir)/metacontactselectorwidget.h
++	$(MOC) $(srcdir)/metacontactselectorwidget.h -o metacontactselectorwidget.moc
  
  #>+ 2
--mocs: kopetepasswordwidget.moc
-+mocs: accountselector.moc
+-mocs: kopetelistviewsearchline.moc
++mocs: metacontactselectorwidget.moc
  
  #>+ 3
--accountselector.moc: $(srcdir)/accountselector.h
--	$(MOC) $(srcdir)/accountselector.h -o accountselector.moc
-+kopetepasswordwidget.moc: $(srcdir)/kopetepasswordwidget.h
-+	$(MOC) $(srcdir)/kopetepasswordwidget.h -o kopetepasswordwidget.moc
+-metacontactselectorwidget.moc: $(srcdir)/metacontactselectorwidget.h
+-	$(MOC) $(srcdir)/metacontactselectorwidget.h -o metacontactselectorwidget.moc
++kopetelistviewsearchline.moc: $(srcdir)/kopetelistviewsearchline.h
++	$(MOC) $(srcdir)/kopetelistviewsearchline.h -o kopetelistviewsearchline.moc
  
  #>+ 2
--mocs: accountselector.moc
-+mocs: kopetepasswordwidget.moc
+-mocs: metacontactselectorwidget.moc
++mocs: kopetelistviewsearchline.moc
  
  #>+ 3
+ addressbookselectorwidget.moc: $(srcdir)/addressbookselectorwidget.h
+@@ -895,7 +898,7 @@
+ 
+ #>+ 3
  clean-metasources:
--	-rm -f  userinfodialog.moc kopetecontactaction.moc kopetefileconfirmdialog.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc accountselector.moc
-+	-rm -f  userinfodialog.moc kopetecontactaction.moc kopetefileconfirmdialog.moc addcontactpage.moc kopetestdaction.moc accountselector.moc kopetepasswordwidget.moc
+-	-rm -f  userinfodialog.moc addressbookselectordialog.moc contactaddednotifydialog.moc kopetelistview.moc kopetecontactaction.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc kopetelistviewitem.moc kopetelistviewsearchline.moc metacontactselectorwidget.moc addressbookselectorwidget.moc kopetefileconfirmdialog.moc accountselector.moc
++	-rm -f  userinfodialog.moc addressbookselectordialog.moc contactaddednotifydialog.moc kopetelistview.moc kopetecontactaction.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc kopetelistviewitem.moc metacontactselectorwidget.moc kopetelistviewsearchline.moc addressbookselectorwidget.moc kopetefileconfirmdialog.moc accountselector.moc
  
  #>+ 2
- KDE_DIST=fileconfirmbase.ui widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui Makefile.in kopetepassworddialog.ui Makefile.am 
+ KDE_DIST=contactaddednotifywidget.ui kopetewidgets.cpp fileconfirmbase.ui kopete.widgets addressbookselectorwidget_base.ui metacontactselectorwidget.h contactaddednotifydialog.h widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui metacontactselectorwidget_base.ui Makefile.in kopetepassworddialog.ui Makefile.am 
 --- kopete/Makefile.in
 +++ kopete/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11236,16 +15754,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -412,7 +415,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -450,9 +453,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11259,7 +15777,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/addbookmarks/Makefile.in
 +++ kopete/plugins/addbookmarks/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -262,6 +262,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11269,7 +15787,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11278,7 +15796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11292,7 +15810,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/alias/Makefile.in
 +++ kopete/plugins/alias/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -252,6 +252,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11302,7 +15820,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -468,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11311,7 +15829,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -506,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11323,7 +15841,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -808,18 +811,18 @@
+@@ -820,18 +823,18 @@
  
  
  #>+ 3
@@ -11348,7 +15866,7 @@
  
  #>+ 3
  editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -839,10 +842,10 @@
+@@ -851,10 +854,10 @@
  
  #>+ 3
  clean-metasources:
@@ -11361,7 +15879,7 @@
  
  #>+ 5
  clean-ui:
-@@ -937,8 +940,8 @@
+@@ -945,8 +948,8 @@
  
  #>+ 11
  nmcheck: 
@@ -11373,7 +15891,7 @@
  aliasplugin.lo: aliasplugin.moc 
 --- kopete/plugins/autoreplace/icons/Makefile.in
 +++ kopete/plugins/autoreplace/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11383,7 +15901,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11392,7 +15910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11406,7 +15924,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/autoreplace/Makefile.in
 +++ kopete/plugins/autoreplace/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11416,7 +15934,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -490,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11425,7 +15943,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -528,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11439,7 +15957,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/connectionstatus/Makefile.in
 +++ kopete/plugins/connectionstatus/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -240,6 +240,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11449,7 +15967,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -445,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11458,7 +15976,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -483,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11472,7 +15990,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/contactnotes/Makefile.in
 +++ kopete/plugins/contactnotes/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -244,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11482,7 +16000,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -453,7 +456,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11491,7 +16009,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -491,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11505,7 +16023,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/cryptography/icons/Makefile.in
 +++ kopete/plugins/cryptography/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11515,7 +16033,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11524,7 +16042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11538,7 +16056,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/cryptography/Makefile.in
 +++ kopete/plugins/cryptography/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -276,6 +276,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11548,7 +16066,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11557,7 +16075,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11569,7 +16087,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -965,6 +968,13 @@
+@@ -977,6 +980,13 @@
  
  
  #>+ 3
@@ -11583,7 +16101,7 @@
  kgpginterface.moc: $(srcdir)/kgpginterface.h
  	$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
  
-@@ -972,11 +982,11 @@
+@@ -984,11 +994,11 @@
  mocs: kgpginterface.moc
  
  #>+ 3
@@ -11598,7 +16116,7 @@
  
  #>+ 3
  kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -993,13 +1003,6 @@
+@@ -1005,13 +1015,6 @@
  mocs: popuppublic.moc
  
  #>+ 3
@@ -11612,7 +16130,7 @@
  cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
  	$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
  
-@@ -1024,7 +1027,7 @@
+@@ -1036,7 +1039,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11621,7 +16139,7 @@
  
  #>+ 2
  KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h 
-@@ -1093,7 +1096,7 @@
+@@ -1105,7 +1108,7 @@
  	rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
  
  #>+ 11
@@ -11632,7 +16150,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
 --- kopete/plugins/highlight/icons/Makefile.in
 +++ kopete/plugins/highlight/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11642,7 +16160,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11651,7 +16169,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11665,7 +16183,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/highlight/Makefile.in
 +++ kopete/plugins/highlight/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11675,7 +16193,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -490,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11684,7 +16202,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -528,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11696,7 +16214,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -963,7 +966,7 @@
+@@ -975,7 +978,7 @@
  	-rm -f  highlightpreferences.moc highlightplugin.moc
  
  #>+ 2
@@ -11707,7 +16225,7 @@
  clean-ui:
 --- kopete/plugins/history/Makefile.in
 +++ kopete/plugins/history/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -259,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11717,7 +16235,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11726,7 +16244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11738,7 +16256,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -865,18 +868,18 @@
+@@ -877,18 +880,18 @@
  
  
  #>+ 3
@@ -11763,7 +16281,7 @@
  
  #>+ 3
  historylogger.moc: $(srcdir)/historylogger.h
-@@ -910,7 +913,7 @@
+@@ -922,7 +925,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11772,7 +16290,7 @@
  
  #>+ 2
  KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h 
-@@ -985,7 +988,7 @@
+@@ -997,7 +1000,7 @@
  	rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
  
  #>+ 11
@@ -11783,7 +16301,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
 --- kopete/plugins/latex/icons/Makefile.in
 +++ kopete/plugins/latex/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11793,7 +16311,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11802,7 +16320,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11816,7 +16334,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/latex/Makefile.in
 +++ kopete/plugins/latex/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11826,7 +16344,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -496,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11835,7 +16353,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -534,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11849,7 +16367,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/Makefile.in
 +++ kopete/plugins/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -215,6 +215,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11859,7 +16377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -418,7 +421,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -11868,7 +16386,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -456,9 +459,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11882,7 +16400,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/motionautoaway/Makefile.in
 +++ kopete/plugins/motionautoaway/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11892,7 +16410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -473,7 +476,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11901,7 +16419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -511,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11913,7 +16431,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -831,18 +834,18 @@
+@@ -843,18 +846,18 @@
  
  
  #>+ 3
@@ -11938,7 +16456,7 @@
  
  #>+ 8
  kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -855,7 +858,7 @@
+@@ -867,7 +870,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11949,7 +16467,7 @@
  KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am 
 --- kopete/plugins/netmeeting/Makefile.in
 +++ kopete/plugins/netmeeting/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11959,7 +16477,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -478,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11968,7 +16486,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -516,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11980,7 +16498,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -879,7 +882,7 @@
+@@ -891,7 +894,7 @@
  	-rm -f  netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
  
  #>+ 2
@@ -11991,17 +16509,17 @@
  clean-ui:
 --- kopete/plugins/nowlistening/Makefile.in
 +++ kopete/plugins/nowlistening/Makefile.in
-@@ -74,8 +74,7 @@
- 	nowlisteningconfig.lo nowlisteningprefs.lo
+@@ -73,8 +73,7 @@
+ kcm_kopete_nowlistening_la_nofinal_OBJECTS = nowlisteningpreferences.lo nowlisteningprefs.lo nowlisteningconfig.lo
  @KDE_USE_FINAL_FALSE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_final_OBJECTS)
 -kopete_nowlistening_la_DEPENDENCIES = ../../libkopete/libkopete.la \
 -	$(am__DEPENDENCIES_1)
 +kopete_nowlistening_la_DEPENDENCIES = ../../libkopete/libkopete.la
- am_kopete_nowlistening_la_OBJECTS = nowlisteningconfig.lo \
- 	nowlisteningplugin.lo nlkscd.lo nlnoatun.lo nlxmms.lo \
- 	nowlisteningguiclient.lo nljuk.lo nlamarok.lo nlkaffeine.lo
-@@ -259,6 +258,9 @@
+ am_kopete_nowlistening_la_OBJECTS = nowlisteningplugin.lo nlkscd.lo \
+ 	nlnoatun.lo nlxmms.lo nowlisteningguiclient.lo nljuk.lo \
+ 	nlamarok.lo nlkaffeine.lo
+@@ -266,6 +265,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12011,18 +16529,18 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,8 +451,8 @@
- AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
- kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
- kopete_nowlistening_la_SOURCES = nowlisteningconfig.cpp nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
--kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS)
+@@ -463,8 +465,8 @@
+ #>- kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+ #>+ 1
+ kopete_nowlistening_la_SOURCES= nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp nowlisteningconfig.cpp
+-kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS) $(all_libraries)
 -kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la $(XMMS_LIBS)
-+kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN)
++kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 +kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la
- #>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
+ #>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
  #>+ 1
- kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp nowlisteningconfig.cpp nowlisteningprefs.cpp
-@@ -471,7 +473,7 @@
+ kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp  nowlisteningprefs.cpp nowlisteningconfig.cpp
+@@ -486,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12031,7 +16549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +511,9 @@
+@@ -524,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12043,7 +16561,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -856,18 +858,18 @@
+@@ -890,18 +892,18 @@
  mocs: nowlisteningpreferences.moc
  
  #>+ 3
@@ -12068,7 +16586,7 @@
  
  #>+ 8
  kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -880,7 +882,7 @@
+@@ -914,7 +916,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12076,19 +16594,19 @@
 +	-rm -f  nowlisteningpreferences.moc nowlisteningplugin.moc nowlisteningguiclient.moc
  
  #>+ 2
- KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nowlisteningconfig.h nlnoatun.h kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h 
-@@ -948,7 +950,7 @@
+ KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nlnoatun.h nowlisteningconfig.kcfg kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningconfig.kcfgc nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h 
+@@ -988,7 +990,7 @@
  	rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
  
  #>+ 11
--kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningconfig.cpp $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp  nowlisteningplugin.moc nowlisteningguiclient.moc
-+kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningconfig.cpp $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp  nowlisteningguiclient.moc nowlisteningplugin.moc
+-kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp nowlisteningconfig.cpp  nowlisteningplugin.moc nowlisteningguiclient.moc
++kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp nowlisteningconfig.cpp  nowlisteningguiclient.moc nowlisteningplugin.moc
  	@echo 'creating kopete_nowlistening_la.all_cpp.cpp ...'; \
  	rm -f kopete_nowlistening_la.all_cpp.files kopete_nowlistening_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
 --- kopete/plugins/smpppdcs/config/Makefile.in
 +++ kopete/plugins/smpppdcs/config/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12098,7 +16616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -460,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12107,7 +16625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -498,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12121,7 +16639,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/smpppdcs/icons/Makefile.in
 +++ kopete/plugins/smpppdcs/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12131,7 +16649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12140,7 +16658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12154,7 +16672,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/smpppdcs/Makefile.in
 +++ kopete/plugins/smpppdcs/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12164,7 +16682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12173,7 +16691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12187,7 +16705,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/statistics/Makefile.in
 +++ kopete/plugins/statistics/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12197,7 +16715,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -475,7 +478,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12206,7 +16724,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -513,9 +516,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12220,7 +16738,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/statistics/sqlite/Makefile.in
 +++ kopete/plugins/statistics/sqlite/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12230,7 +16748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -12239,7 +16757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12253,7 +16771,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/plugins/texteffect/icons/Makefile.in
 +++ kopete/plugins/texteffect/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12263,7 +16781,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12272,7 +16790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12286,7 +16804,7 @@
  mostlyclean-libtool:
 --- kopete/plugins/texteffect/Makefile.in
 +++ kopete/plugins/texteffect/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12296,7 +16814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -490,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12305,7 +16823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -528,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12319,7 +16837,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/translator/Makefile.in
 +++ kopete/plugins/translator/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -263,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12329,7 +16847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12338,7 +16856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12350,7 +16868,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -878,7 +881,7 @@
+@@ -890,7 +893,7 @@
  	-rm -f  translatorplugin.moc translatorguiclient.moc translatordialog.moc
  
  #>+ 2
@@ -12361,7 +16879,7 @@
  clean-ui:
 --- kopete/plugins/webpresence/Makefile.in
 +++ kopete/plugins/webpresence/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12371,7 +16889,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -477,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12380,7 +16898,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -515,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12394,7 +16912,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/gadu/icons/Makefile.in
 +++ kopete/protocols/gadu/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12404,7 +16922,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12413,7 +16931,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12425,67 +16943,72 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,7 +568,7 @@
+@@ -577,7 +580,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-app-gadu_protocol.png cr16-action-gg_away.png cr16-action-gg_online_d.png Makefile.am 
-+KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-action-gg_away.png cr16-app-gadu_protocol.png cr16-action-gg_online_d.png Makefile.am 
+-KDE_DIST=cr16-action-gg_busy_d.png cr16-action-gg_invi_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_description_overlay.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-app-gadu_protocol.png cr16-action-gg_away.png cr16-action-gg_online_d.png Makefile.am 
++KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_description_overlay.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-action-gg_away.png cr16-app-gadu_protocol.png cr16-action-gg_online_d.png Makefile.am 
  
  #>+ 2
  docs-am:
-@@ -573,38 +576,38 @@
- #>+ 35
+@@ -585,40 +588,40 @@
+ #>+ 37
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_connecting.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_description_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
 -	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_connecting.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/cr16-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_description_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
 +	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
  
  uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
 -	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
  	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
 +	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
  
@@ -12493,7 +17016,7 @@
  force-reedit:
 --- kopete/protocols/gadu/libgadu/Makefile.in
 +++ kopete/protocols/gadu/libgadu/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12503,7 +17026,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -433,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -12512,7 +17035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -471,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12526,7 +17049,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/gadu/Makefile.in
 +++ kopete/protocols/gadu/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -271,6 +271,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12536,7 +17059,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12545,7 +17068,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12557,7 +17080,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -985,11 +988,11 @@
+@@ -997,11 +1000,11 @@
  mocs: gaducommands.moc
  
  #>+ 3
@@ -12572,7 +17095,7 @@
  
  #>+ 3
  gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -999,11 +1002,11 @@
+@@ -1011,11 +1014,11 @@
  mocs: gaduregisteraccount.moc
  
  #>+ 3
@@ -12587,7 +17110,7 @@
  
  #>+ 3
  gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1020,25 +1023,25 @@
+@@ -1032,25 +1035,25 @@
  mocs: gaduprotocol.moc
  
  #>+ 3
@@ -12621,7 +17144,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1086,7 +1089,7 @@
+@@ -1098,7 +1101,7 @@
  
  
  #>+ 11
@@ -12630,7 +17153,7 @@
  	@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
  	rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
-@@ -1141,11 +1144,11 @@
+@@ -1149,11 +1152,11 @@
  gadupubdir.o: gadupubdir.moc 
  gadueditaccount.lo: gadueditaccount.moc 
  gadudccserver.lo: gadudccserver.moc 
@@ -12646,7 +17169,7 @@
  gaduaddcontactpage.o: gaduaddcontactpage.moc 
 --- kopete/protocols/gadu/ui/Makefile.in
 +++ kopete/protocols/gadu/ui/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12656,7 +17179,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -441,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12665,7 +17188,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12679,7 +17202,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/groupwise/icons/Makefile.in
 +++ kopete/protocols/groupwise/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12689,7 +17212,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12698,7 +17221,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12710,7 +17233,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,7 +568,7 @@
+@@ -577,7 +580,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -12719,7 +17242,7 @@
  
  #>+ 2
  docs-am:
-@@ -573,47 +576,47 @@
+@@ -585,47 +588,47 @@
  #>+ 44
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -12795,7 +17318,7 @@
  force-reedit:
 --- kopete/protocols/groupwise/libgroupwise/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -270,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12805,7 +17328,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -508,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -12814,7 +17337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -546,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12826,7 +17349,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -933,18 +936,18 @@
+@@ -945,18 +948,18 @@
  
  
  #>+ 3
@@ -12851,7 +17374,7 @@
  
  #>+ 3
  stream.moc: $(srcdir)/stream.h
-@@ -954,18 +957,18 @@
+@@ -966,18 +969,18 @@
  mocs: stream.moc
  
  #>+ 3
@@ -12876,7 +17399,7 @@
  
  #>+ 3
  qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1055,7 +1058,7 @@
+@@ -1067,7 +1070,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12887,7 +17410,7 @@
  KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am 
 --- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -213,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12897,7 +17420,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12906,7 +17429,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12920,7 +17443,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12930,7 +17453,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -430,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12939,7 +17462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -468,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12953,7 +17476,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12963,7 +17486,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -477,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12972,7 +17495,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -515,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12984,7 +17507,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -838,13 +841,6 @@
+@@ -850,13 +853,6 @@
  mocs: connectiontask.moc
  
  #>+ 3
@@ -12998,7 +17521,7 @@
  logintask.moc: $(srcdir)/logintask.h
  	$(MOC) $(srcdir)/logintask.h -o logintask.moc
  
-@@ -859,6 +855,13 @@
+@@ -871,6 +867,13 @@
  mocs: createcontactinstancetask.moc
  
  #>+ 3
@@ -13012,7 +17535,7 @@
  rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
  	$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
  
-@@ -880,18 +883,18 @@
+@@ -892,18 +895,18 @@
  mocs: getdetailstask.moc
  
  #>+ 3
@@ -13037,7 +17560,7 @@
  
  #>+ 3
  joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -972,10 +975,10 @@
+@@ -984,10 +987,10 @@
  
  #>+ 3
  clean-metasources:
@@ -13050,7 +17573,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1023,7 +1026,7 @@
+@@ -1035,7 +1038,7 @@
  
  
  #>+ 11
@@ -13059,7 +17582,7 @@
  	@echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
  	rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
-@@ -1100,8 +1103,8 @@
+@@ -1108,8 +1111,8 @@
  conferencetask.lo: conferencetask.moc 
  createcontacttask.o: createcontacttask.moc 
  logintask.lo: logintask.moc 
@@ -13069,7 +17592,7 @@
  updatecontacttask.lo: updatecontacttask.moc 
  setstatustask.lo: setstatustask.moc 
  logintask.o: logintask.moc 
-@@ -1114,8 +1117,8 @@
+@@ -1122,8 +1125,8 @@
  typingtask.lo: typingtask.moc 
  requesttask.o: requesttask.moc 
  updateitemtask.lo: updateitemtask.moc 
@@ -13081,7 +17604,7 @@
  typingtask.o: typingtask.moc 
 --- kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
-@@ -220,6 +220,9 @@
+@@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13091,7 +17614,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,7 +419,7 @@
+@@ -428,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13100,7 +17623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +457,9 @@
+@@ -466,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13114,7 +17637,7 @@
  clean-noinstPROGRAMS:
 --- kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13124,7 +17647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -468,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13133,7 +17656,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -506,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13147,7 +17670,7 @@
  clean-noinstPROGRAMS:
 --- kopete/protocols/groupwise/Makefile.in
 +++ kopete/protocols/groupwise/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13157,7 +17680,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -490,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13166,7 +17689,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -528,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13178,7 +17701,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -934,18 +937,18 @@
+@@ -946,18 +949,18 @@
  
  
  #>+ 3
@@ -13203,7 +17726,7 @@
  
  #>+ 3
  gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -962,18 +965,18 @@
+@@ -974,18 +977,18 @@
  mocs: gwconnector.moc
  
  #>+ 3
@@ -13228,7 +17751,7 @@
  
  #>+ 3
  gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -984,7 +987,7 @@
+@@ -996,7 +999,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13236,8 +17759,8 @@
 +	-rm -f  gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
  
  #>+ 2
- KDE_DIST=gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am 
-@@ -1035,7 +1038,7 @@
+ KDE_DIST=DESIGN gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am 
+@@ -1047,7 +1050,7 @@
  
  
  #>+ 11
@@ -13246,7 +17769,7 @@
  	@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
  	rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
-@@ -1080,8 +1083,8 @@
+@@ -1088,8 +1091,8 @@
  gwbytestream.o: gwbytestream.moc 
  gwconnector.o: gwconnector.moc 
  gwaccount.lo: gwaccount.moc 
@@ -13258,7 +17781,7 @@
  gwcontact.o: gwcontact.moc 
 --- kopete/protocols/groupwise/ui/Makefile.in
 +++ kopete/protocols/groupwise/ui/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13268,7 +17791,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -460,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13277,7 +17800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -498,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13291,7 +17814,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/irc/icons/Makefile.in
 +++ kopete/protocols/irc/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13301,7 +17824,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13310,7 +17833,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13322,7 +17845,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -572,31 +575,31 @@
+@@ -584,31 +587,31 @@
  
  #>+ 27
  install-kde-icons:
@@ -13369,7 +17892,7 @@
  force-reedit:
 --- kopete/protocols/irc/libkirc/Makefile.in
 +++ kopete/protocols/irc/libkirc/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -233,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13379,7 +17902,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -451,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13388,7 +17911,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -489,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13400,7 +17923,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -758,18 +761,18 @@
+@@ -770,36 +773,36 @@
  mocs: kirctransferserver.moc
  
  #>+ 3
@@ -13414,29 +17937,45 @@
 +mocs: kirctransferhandler.moc
  
  #>+ 3
--kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
--	$(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
+-kircmessage.moc: $(srcdir)/kircmessage.h
+-	$(MOC) $(srcdir)/kircmessage.h -o kircmessage.moc
 +kircengine.moc: $(srcdir)/kircengine.h
 +	$(MOC) $(srcdir)/kircengine.h -o kircengine.moc
  
  #>+ 2
--mocs: kirctransferhandler.moc
+-mocs: kircmessage.moc
 +mocs: kircengine.moc
  
  #>+ 3
- ksslsocket.moc: $(srcdir)/ksslsocket.h
-@@ -780,7 +783,7 @@
+-kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
+-	$(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
++ksslsocket.moc: $(srcdir)/ksslsocket.h
++	$(MOC) $(srcdir)/ksslsocket.h -o ksslsocket.moc
  
+ #>+ 2
+-mocs: kirctransferhandler.moc
++mocs: ksslsocket.moc
+ 
  #>+ 3
+-ksslsocket.moc: $(srcdir)/ksslsocket.h
+-	$(MOC) $(srcdir)/ksslsocket.h -o ksslsocket.moc
++kircmessage.moc: $(srcdir)/kircmessage.h
++	$(MOC) $(srcdir)/kircmessage.h -o kircmessage.moc
+ 
+ #>+ 2
+-mocs: ksslsocket.moc
++mocs: kircmessage.moc
+ 
+ #>+ 3
  clean-metasources:
--	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kircengine.moc kirctransferhandler.moc ksslsocket.moc
-+	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kirctransferhandler.moc kircengine.moc ksslsocket.moc
+-	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kircengine.moc kircmessage.moc kirctransferhandler.moc ksslsocket.moc
++	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kirctransferhandler.moc kircengine.moc ksslsocket.moc kircmessage.moc
  
  #>+ 2
  KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am 
 --- kopete/protocols/irc/Makefile.in
 +++ kopete/protocols/irc/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -269,6 +269,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13446,7 +17985,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -502,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13455,7 +17994,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -540,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13467,7 +18006,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -978,18 +981,18 @@
+@@ -990,18 +993,18 @@
  mocs: ircchannelcontact.moc
  
  #>+ 3
@@ -13492,7 +18031,7 @@
  
  #>+ 3
  ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1006,18 +1009,18 @@
+@@ -1018,18 +1021,18 @@
  mocs: irccontact.moc
  
  #>+ 3
@@ -13517,7 +18056,7 @@
  
  #>+ 3
  ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1056,7 +1059,7 @@
+@@ -1068,7 +1071,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13526,7 +18065,7 @@
  
  #>+ 2
  KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h 
-@@ -1107,7 +1110,7 @@
+@@ -1119,7 +1122,7 @@
  
  
  #>+ 11
@@ -13537,7 +18076,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
 --- kopete/protocols/irc/ui/Makefile.in
 +++ kopete/protocols/irc/ui/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13547,7 +18086,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13556,7 +18095,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13570,7 +18109,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/icons/Makefile.in
 +++ kopete/protocols/jabber/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13580,7 +18119,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13589,7 +18128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13601,7 +18140,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,87 +568,87 @@
+@@ -577,87 +580,87 @@
  .NOEXPORT:
  
  #>+ 2
@@ -13745,9 +18284,42 @@
  
  #>+ 15
  force-reedit:
+--- kopete/protocols/jabber/kioslave/Makefile.in
++++ kopete/protocols/jabber/kioslave/Makefile.in
+@@ -250,6 +250,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -467,7 +470,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*) \
+@@ -505,9 +508,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kopete/protocols/jabber/libiris/cutestuff/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13757,7 +18329,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13766,7 +18338,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13780,7 +18352,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13790,7 +18362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -439,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13799,7 +18371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13811,7 +18383,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -716,18 +719,18 @@
+@@ -728,18 +731,18 @@
  mocs: ndns.moc
  
  #>+ 3
@@ -13836,7 +18408,7 @@
  
  #>+ 3
  httppoll.moc: $(srcdir)/httppoll.h
-@@ -752,10 +755,10 @@
+@@ -764,10 +767,10 @@
  
  #>+ 3
  clean-metasources:
@@ -13851,7 +18423,7 @@
  docs-am:
 --- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13861,7 +18433,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -439,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13870,7 +18442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13884,7 +18456,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/include/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/include/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13894,7 +18466,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -433,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13903,7 +18475,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -471,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13917,7 +18489,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13927,7 +18499,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -437,7 +440,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13936,7 +18508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13950,7 +18522,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13960,7 +18532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13969,7 +18541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13983,7 +18555,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13993,7 +18565,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -463,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14002,7 +18574,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -501,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14016,7 +18588,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
-@@ -221,6 +221,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14026,7 +18598,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -438,7 +441,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14035,7 +18607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -476,9 +479,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14049,7 +18621,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/Makefile.in
 +++ kopete/protocols/jabber/libiris/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14059,7 +18631,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14068,7 +18640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14082,7 +18654,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/qca/Makefile.in
 +++ kopete/protocols/jabber/libiris/qca/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -213,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14092,7 +18664,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14101,7 +18673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14115,7 +18687,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/qca/src/Makefile.in
 +++ kopete/protocols/jabber/libiris/qca/src/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14125,7 +18697,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -429,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14134,7 +18706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -467,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14148,7 +18720,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/Makefile.in
 +++ kopete/protocols/jabber/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -289,6 +289,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14158,7 +18730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -541,7 +544,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14167,7 +18739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14179,7 +18751,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1005,18 +1008,18 @@
+@@ -1054,18 +1057,18 @@
  mocs: jabbergroupchatmanager.moc
  
  #>+ 3
@@ -14204,37 +18776,27 @@
  
  #>+ 3
  jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1069,7 +1072,7 @@
+@@ -1118,7 +1121,7 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
-+	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
+-	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
++	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
  
  #>+ 2
  KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h 
-@@ -1120,7 +1123,7 @@
+@@ -1169,7 +1172,7 @@
  
  
  #>+ 11
--kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabberbytestream.cpp $(srcdir)/jabberconnector.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
-+kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabberbytestream.cpp $(srcdir)/jabberconnector.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
+-kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbergroupmembercontact.moc
++kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbergroupmembercontact.moc
  	@echo 'creating kopete_jabber_la.all_cpp.cpp ...'; \
  	rm -f kopete_jabber_la.all_cpp.files kopete_jabber_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
-@@ -1172,8 +1175,8 @@
- jabberformlineedit.o: jabberformlineedit.moc 
- jabberfiletransfer.o: jabberfiletransfer.moc 
- nmcheck-am: nmcheck
--jabberresource.o: jabberresource.moc 
- jabbercontact.lo: jabbercontact.moc 
-+jabberresource.o: jabberresource.moc 
- jabberresourcepool.o: jabberresourcepool.moc 
- jabbercontactpool.lo: jabbercontactpool.moc 
- jabberformtranslator.o: jabberformtranslator.moc 
 --- kopete/protocols/jabber/ui/Makefile.in
 +++ kopete/protocols/jabber/ui/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14244,7 +18806,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14253,7 +18815,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14265,52 +18827,76 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -768,18 +771,18 @@
+@@ -783,13 +786,6 @@
  mocs: dlgjabbervcard.moc
  
  #>+ 3
 -dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
 -	$(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
-+dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
-+	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: dlgjabberbrowse.moc
-+mocs: dlgjabberregister.moc
+-
+-#>+ 3
+ dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
+ 	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
  
+@@ -804,6 +800,13 @@
+ mocs: dlgjabberchangepassword.moc
+ 
  #>+ 3
--dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
--	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
 +dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
 +	$(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
++
++#>+ 2
++mocs: dlgjabberbrowse.moc
++
++#>+ 3
+ dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
+ 	$(MOC) $(srcdir)/dlgjabberchatjoin.h -o dlgjabberchatjoin.moc
  
+@@ -825,22 +828,22 @@
+ mocs: dlgjabberservices.moc
+ 
+ #>+ 3
+-dlgjabbersendraw.moc: $(srcdir)/dlgjabbersendraw.h
+-	$(MOC) $(srcdir)/dlgjabbersendraw.h -o dlgjabbersendraw.moc
++jabberchooseserver.moc: $(srcdir)/jabberchooseserver.h
++	$(MOC) $(srcdir)/jabberchooseserver.h -o jabberchooseserver.moc
+ 
  #>+ 2
--mocs: dlgjabberregister.moc
-+mocs: dlgjabberbrowse.moc
+-mocs: dlgjabbersendraw.moc
++mocs: jabberchooseserver.moc
  
  #>+ 3
- dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
-@@ -818,7 +821,7 @@
+-jabberchooseserver.moc: $(srcdir)/jabberchooseserver.h
+-	$(MOC) $(srcdir)/jabberchooseserver.h -o jabberchooseserver.moc
++dlgjabbersendraw.moc: $(srcdir)/dlgjabbersendraw.h
++	$(MOC) $(srcdir)/dlgjabbersendraw.h -o dlgjabbersendraw.moc
  
+ #>+ 2
+-mocs: jabberchooseserver.moc
++mocs: dlgjabbersendraw.moc
+ 
  #>+ 3
  clean-metasources:
--	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
-+	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
+-	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgjabberchangepassword.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc dlgjabbersendraw.moc jabberchooseserver.moc
++	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberregister.moc dlgjabberchangepassword.moc dlgjabberbrowse.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
  
  #>+ 2
- KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h 
-@@ -879,7 +882,7 @@
+ KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgchangepassword.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberchangepassword.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h 
+@@ -902,7 +905,7 @@
  
  
  #>+ 11
--libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc
-+libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc
+-libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberchangepassword.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc dlgchangepassword.moc
++libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberbrowse.moc dlgjabberchangepassword.moc dlgjabberregister.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc dlgchangepassword.moc
  	@echo 'creating libkopetejabberui_la.all_cpp.cpp ...'; \
  	rm -f libkopetejabberui_la.all_cpp.files libkopetejabberui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
 --- kopete/protocols/Makefile.in
 +++ kopete/protocols/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -213,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14320,7 +18906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -414,7 +417,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14329,7 +18915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -452,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14343,7 +18929,7 @@
  mostlyclean-libtool:
 --- kopete/protocols/meanwhile/icons/Makefile.in
 +++ kopete/protocols/meanwhile/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14353,7 +18939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14362,7 +18948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14374,7 +18960,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -574,36 +577,36 @@
+@@ -586,36 +589,36 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
  	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
@@ -14426,7 +19012,7 @@
  force-reedit:
 --- kopete/protocols/meanwhile/Makefile.in
 +++ kopete/protocols/meanwhile/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -268,6 +268,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14436,7 +19022,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -504,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14445,7 +19031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -542,9 +545,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14459,7 +19045,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/meanwhile/ui/Makefile.in
 +++ kopete/protocols/meanwhile/ui/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14469,7 +19055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -436,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14478,7 +19064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14492,7 +19078,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/msn/config/Makefile.in
 +++ kopete/protocols/msn/config/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14502,7 +19088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14511,7 +19097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14525,7 +19111,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/msn/icons/Makefile.in
 +++ kopete/protocols/msn/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14535,7 +19121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14544,7 +19130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14556,7 +19142,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -573,47 +576,47 @@
+@@ -585,47 +588,47 @@
  #>+ 44
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -14635,7 +19221,7 @@
  force-reedit:
 --- kopete/protocols/msn/Makefile.in
 +++ kopete/protocols/msn/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -284,6 +284,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14645,7 +19231,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -518,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14654,7 +19240,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -556,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14666,81 +19252,84 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1011,13 +1014,6 @@
- mocs: msnsecureloginhandler.moc
+@@ -1070,18 +1073,18 @@
+ mocs: msndebugrawcmddlg.moc
  
  #>+ 3
+-msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
+-	$(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
++msncontact.moc: $(srcdir)/msncontact.h
++	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
+ 
+ #>+ 2
+-mocs: msnfiletransfersocket.moc
++mocs: msncontact.moc
+ 
+ #>+ 3
 -msncontact.moc: $(srcdir)/msncontact.h
 -	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
--
--#>+ 2
++msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
++	$(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
+ 
+ #>+ 2
 -mocs: msncontact.moc
--
--#>+ 3
- msnp2pdisplatcher.moc: $(srcdir)/msnp2pdisplatcher.h
- 	$(MOC) $(srcdir)/msnp2pdisplatcher.h -o msnp2pdisplatcher.moc
++mocs: msnfiletransfersocket.moc
  
-@@ -1039,6 +1035,13 @@
- mocs: msnfiletransfersocket.moc
- 
  #>+ 3
-+msncontact.moc: $(srcdir)/msncontact.h
-+	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
-+
-+#>+ 2
-+mocs: msncontact.moc
-+
-+#>+ 3
  msnprotocol.moc: $(srcdir)/msnprotocol.h
- 	$(MOC) $(srcdir)/msnprotocol.h -o msnprotocol.moc
+@@ -1133,11 +1136,11 @@
+ mocs: p2p.moc
  
-@@ -1074,18 +1077,18 @@
- mocs: msnswitchboardsocket.moc
- 
  #>+ 3
--msnp2poutgoing.moc: $(srcdir)/msnp2poutgoing.h
--	$(MOC) $(srcdir)/msnp2poutgoing.h -o msnp2poutgoing.moc
-+msnp2p.moc: $(srcdir)/msnp2p.h
-+	$(MOC) $(srcdir)/msnp2p.h -o msnp2p.moc
+-webcam.moc: $(srcdir)/webcam.h
+-	$(MOC) $(srcdir)/webcam.h -o webcam.moc
++dispatcher.moc: $(srcdir)/dispatcher.h
++	$(MOC) $(srcdir)/dispatcher.h -o dispatcher.moc
  
  #>+ 2
--mocs: msnp2poutgoing.moc
-+mocs: msnp2p.moc
+-mocs: webcam.moc
++mocs: dispatcher.moc
  
  #>+ 3
--msnp2p.moc: $(srcdir)/msnp2p.h
--	$(MOC) $(srcdir)/msnp2p.h -o msnp2p.moc
-+msnp2poutgoing.moc: $(srcdir)/msnp2poutgoing.h
-+	$(MOC) $(srcdir)/msnp2poutgoing.h -o msnp2poutgoing.moc
+ messageformatter.moc: $(srcdir)/messageformatter.h
+@@ -1147,11 +1150,11 @@
+ mocs: messageformatter.moc
  
+ #>+ 3
+-dispatcher.moc: $(srcdir)/dispatcher.h
+-	$(MOC) $(srcdir)/dispatcher.h -o dispatcher.moc
++webcam.moc: $(srcdir)/webcam.h
++	$(MOC) $(srcdir)/webcam.h -o webcam.moc
+ 
  #>+ 2
--mocs: msnp2p.moc
-+mocs: msnp2poutgoing.moc
+-mocs: dispatcher.moc
++mocs: webcam.moc
  
- #>+ 3
- msnaddcontactpage.moc: $(srcdir)/msnaddcontactpage.h
-@@ -1112,7 +1115,7 @@
+ #>+ 8
+ libkopete_msn_shared.la.closure: $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_DEPENDENCIES)
+@@ -1164,7 +1167,7 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  msndebugrawcmddlg.moc msnsecureloginhandler.moc msncontact.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2poutgoing.moc msnp2p.moc msnaddcontactpage.moc msnp2pincoming.moc
-+	-rm -f  msndebugrawcmddlg.moc msnsecureloginhandler.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnp2poutgoing.moc msnaddcontactpage.moc msnp2pincoming.moc
+-	-rm -f  msnsecureloginhandler.moc incomingtransfer.moc msnchallengehandler.moc msnswitchboardsocket.moc msnaddcontactpage.moc msndebugrawcmddlg.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnchatsession.moc msnaccount.moc outgoingtransfer.moc msnsocket.moc msnnotifysocket.moc p2p.moc webcam.moc messageformatter.moc dispatcher.moc
++	-rm -f  msnsecureloginhandler.moc incomingtransfer.moc msnchallengehandler.moc msnswitchboardsocket.moc msnaddcontactpage.moc msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnprotocol.moc msnchatsession.moc msnaccount.moc outgoingtransfer.moc msnsocket.moc msnnotifysocket.moc p2p.moc dispatcher.moc messageformatter.moc webcam.moc
  
  #>+ 2
- KDE_DIST=msnp2poutgoing.h kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h msnp2pincoming.h msnsecureloginhandler.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msnp2pdisplatcher.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am 
-@@ -1203,8 +1206,8 @@
- msnnotifysocket.lo: msnnotifysocket.moc 
- msncontact.o: msncontact.moc 
- msnp2p.lo: msnp2p.moc 
--msnsecureloginhandler.lo: msnsecureloginhandler.moc 
+ KDE_DIST=kopete_msn.desktop msncontact.h msnchatui.rc Changelog msnsocket.h msnsecureloginhandler.h ReleaseNotes msnchallengehandler.h msnchatsession.h msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am 
+@@ -1256,9 +1259,9 @@
+ msnsecureloginhandler.lo: msnsecureloginhandler.moc 
  msnfiletransfersocket.o: msnfiletransfersocket.moc 
-+msnsecureloginhandler.lo: msnsecureloginhandler.moc 
- msnmessagemanager.lo: msnmessagemanager.moc 
+ outgoingtransfer.lo: outgoingtransfer.moc 
++webcam.lo: webcam.moc 
  msndebugrawcmddlg.o: msndebugrawcmddlg.moc 
+ p2p.lo: p2p.moc 
+-webcam.lo: webcam.moc 
+ dispatcher.lo: dispatcher.moc 
+ msnchallengehandler.o: msnchallengehandler.moc 
  msnsocket.lo: msnsocket.moc 
 --- kopete/protocols/msn/ui/Makefile.in
 +++ kopete/protocols/msn/ui/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14750,7 +19339,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -439,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14759,7 +19348,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14771,9 +19360,84 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
+--- kopete/protocols/msn/webcam/libmimic/Makefile.in
++++ kopete/protocols/msn/webcam/libmimic/Makefile.in
+@@ -224,6 +224,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -442,7 +445,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -480,9 +483,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/msn/webcam/Makefile.in
++++ kopete/protocols/msn/webcam/Makefile.in
+@@ -243,6 +243,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -453,7 +456,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -491,9 +494,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+@@ -850,7 +853,7 @@
+ 	-rm -f  msnwebcamdialog.moc
+ 
+ #>+ 2
+-KDE_DIST=msnwebcamdialog.h Makefile.in Makefile.am mimicwrapper.h 
++KDE_DIST=msnwebcamdialog.h Makefile.in mimicwrapper.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
 --- kopete/protocols/oscar/aim/Makefile.in
 +++ kopete/protocols/oscar/aim/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -259,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14783,7 +19447,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -474,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14792,7 +19456,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -512,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14804,9 +19468,59 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -929,22 +932,22 @@
+ mocs: aimaccount.moc
+ 
+ #>+ 3
+-aimprotocol.moc: $(srcdir)/aimprotocol.h
+-	$(MOC) $(srcdir)/aimprotocol.h -o aimprotocol.moc
++aimjoinchat.moc: $(srcdir)/aimjoinchat.h
++	$(MOC) $(srcdir)/aimjoinchat.h -o aimjoinchat.moc
+ 
+ #>+ 2
+-mocs: aimprotocol.moc
++mocs: aimjoinchat.moc
+ 
+ #>+ 3
+-aimjoinchat.moc: $(srcdir)/aimjoinchat.h
+-	$(MOC) $(srcdir)/aimjoinchat.h -o aimjoinchat.moc
++aimprotocol.moc: $(srcdir)/aimprotocol.h
++	$(MOC) $(srcdir)/aimprotocol.h -o aimprotocol.moc
+ 
+ #>+ 2
+-mocs: aimjoinchat.moc
++mocs: aimprotocol.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc
++	-rm -f  aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc
+ 
+ #>+ 2
+ KDE_DIST=aimuserinfo.h kopete_aim.desktop aim.protocol aimcontact.h aimaccount.h Makefile.in aimjoinchat.h Makefile.am aimprotocol.h 
+@@ -995,7 +998,7 @@
+ 
+ 
+ #>+ 11
+-kopete_aim_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/aimprotocol.cpp $(srcdir)/aimaccount.cpp $(srcdir)/aimcontact.cpp $(srcdir)/aimuserinfo.cpp $(srcdir)/aimjoinchat.cpp  aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc
++kopete_aim_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/aimprotocol.cpp $(srcdir)/aimaccount.cpp $(srcdir)/aimcontact.cpp $(srcdir)/aimuserinfo.cpp $(srcdir)/aimjoinchat.cpp  aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc
+ 	@echo 'creating kopete_aim_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_aim_la.all_cpp.files kopete_aim_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_aim_la.all_cpp.final; \
+@@ -1033,9 +1036,9 @@
+ #>+ 13
+ aimcontact.o: aimcontact.moc 
+ aimjoinchat.o: aimjoinchat.moc 
+-aimjoinchat.lo: aimjoinchat.moc 
+ aimcontact.lo: aimcontact.moc 
+ aimaccount.lo: aimaccount.moc 
++aimjoinchat.lo: aimjoinchat.moc 
+ nmcheck: 
+ aimprotocol.lo: aimprotocol.moc 
+ aimuserinfo.o: aimuserinfo.moc 
 --- kopete/protocols/oscar/aim/ui/Makefile.in
 +++ kopete/protocols/oscar/aim/ui/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14816,7 +19530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14825,7 +19539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14839,7 +19553,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/oscar/icons/Makefile.in
 +++ kopete/protocols/oscar/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14849,7 +19563,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14858,7 +19572,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14870,7 +19584,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -565,7 +568,7 @@
+@@ -577,7 +580,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -14879,7 +19593,7 @@
  
  #>+ 2
  docs-am:
-@@ -573,96 +576,96 @@
+@@ -585,96 +588,96 @@
  #>+ 93
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
@@ -15043,7 +19757,7 @@
  force-reedit:
 --- kopete/protocols/oscar/icq/Makefile.in
 +++ kopete/protocols/oscar/icq/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15053,7 +19767,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -478,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15062,7 +19776,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -516,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15076,7 +19790,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/oscar/icq/ui/Makefile.in
 +++ kopete/protocols/oscar/icq/ui/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15086,7 +19800,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -459,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15095,7 +19809,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15107,18 +19821,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -759,7 +762,7 @@
+@@ -771,7 +774,7 @@
  	-rm -f  icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
  
  #>+ 2
--KDE_DIST=icqadd.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqsearchbase.ui icqgeneralinfo.ui Makefile.am 
-+KDE_DIST=icqadd.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqgeneralinfo.ui icqsearchbase.ui Makefile.am 
+-KDE_DIST=icqadd.ui icqinterestinfowidget.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqsearchbase.ui icqgeneralinfo.ui Makefile.am 
++KDE_DIST=icqadd.ui icqaddcontactpage.h icqinterestinfowidget.ui icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqgeneralinfo.ui icqsearchbase.ui Makefile.am 
  
- #>+ 10
+ #>+ 11
  clean-ui:
 --- kopete/protocols/oscar/liboscar/Makefile.in
 +++ kopete/protocols/oscar/liboscar/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -278,6 +278,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15128,7 +19842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -498,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15137,7 +19851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -536,9 +539,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15149,7 +19863,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -888,18 +891,18 @@
+@@ -914,18 +917,18 @@
  mocs: servicesetuptask.moc
  
  #>+ 3
@@ -15174,132 +19888,84 @@
  
  #>+ 3
  bytestream.moc: $(srcdir)/bytestream.h
-@@ -930,18 +933,18 @@
- mocs: stream.moc
- 
- #>+ 3
--ssiauthtask.moc: $(srcdir)/ssiauthtask.h
--	$(MOC) $(srcdir)/ssiauthtask.h -o ssiauthtask.moc
-+rateclassmanager.moc: $(srcdir)/rateclassmanager.h
-+	$(MOC) $(srcdir)/rateclassmanager.h -o rateclassmanager.moc
- 
- #>+ 2
--mocs: ssiauthtask.moc
-+mocs: rateclassmanager.moc
- 
- #>+ 3
--rateclassmanager.moc: $(srcdir)/rateclassmanager.h
--	$(MOC) $(srcdir)/rateclassmanager.h -o rateclassmanager.moc
-+ssiauthtask.moc: $(srcdir)/ssiauthtask.h
-+	$(MOC) $(srcdir)/ssiauthtask.h -o ssiauthtask.moc
- 
- #>+ 2
--mocs: rateclassmanager.moc
-+mocs: ssiauthtask.moc
- 
- #>+ 3
- usersearchtask.moc: $(srcdir)/usersearchtask.h
-@@ -958,11 +961,11 @@
+@@ -984,13 +987,6 @@
  mocs: rateclass.moc
  
  #>+ 3
 -ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
 -	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
-+snacprotocol.moc: $(srcdir)/snacprotocol.h
-+	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: ownuserinfotask.moc
-+mocs: snacprotocol.moc
+-
+-#>+ 3
+ snacprotocol.moc: $(srcdir)/snacprotocol.h
+ 	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
  
- #>+ 3
- rateinfotask.moc: $(srcdir)/rateinfotask.h
-@@ -972,11 +975,11 @@
+@@ -1005,6 +1001,13 @@
  mocs: rateinfotask.moc
  
  #>+ 3
--snacprotocol.moc: $(srcdir)/snacprotocol.h
--	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
 +ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
 +	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
- 
- #>+ 2
--mocs: snacprotocol.moc
++
++#>+ 2
 +mocs: ownuserinfotask.moc
- 
- #>+ 3
++
++#>+ 3
  safedelete.moc: $(srcdir)/safedelete.h
-@@ -1042,18 +1045,18 @@
- mocs: oscarclientstream.moc
+ 	$(MOC) $(srcdir)/safedelete.h -o safedelete.moc
  
- #>+ 3
--closeconnectiontask.moc: $(srcdir)/closeconnectiontask.h
--	$(MOC) $(srcdir)/closeconnectiontask.h -o closeconnectiontask.moc
-+logintask.moc: $(srcdir)/logintask.h
-+	$(MOC) $(srcdir)/logintask.h -o logintask.moc
+@@ -1026,18 +1029,18 @@
+ mocs: userinfotask.moc
  
- #>+ 2
--mocs: closeconnectiontask.moc
-+mocs: logintask.moc
- 
  #>+ 3
--logintask.moc: $(srcdir)/logintask.h
--	$(MOC) $(srcdir)/logintask.h -o logintask.moc
-+closeconnectiontask.moc: $(srcdir)/closeconnectiontask.h
-+	$(MOC) $(srcdir)/closeconnectiontask.h -o closeconnectiontask.moc
+-ssilisttask.moc: $(srcdir)/ssilisttask.h
+-	$(MOC) $(srcdir)/ssilisttask.h -o ssilisttask.moc
++connection.moc: $(srcdir)/connection.h
++	$(MOC) $(srcdir)/connection.h -o connection.moc
  
  #>+ 2
--mocs: logintask.moc
-+mocs: closeconnectiontask.moc
+-mocs: ssilisttask.moc
++mocs: connection.moc
  
  #>+ 3
- connector.moc: $(srcdir)/connector.h
-@@ -1105,25 +1108,25 @@
- mocs: oscarbytestream.moc
+-connection.moc: $(srcdir)/connection.h
+-	$(MOC) $(srcdir)/connection.h -o connection.moc
++ssilisttask.moc: $(srcdir)/ssilisttask.h
++	$(MOC) $(srcdir)/ssilisttask.h -o ssilisttask.moc
  
- #>+ 3
--inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
--	$(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
-+messagereceivertask.moc: $(srcdir)/messagereceivertask.h
-+	$(MOC) $(srcdir)/messagereceivertask.h -o messagereceivertask.moc
- 
  #>+ 2
--mocs: inputprotocolbase.moc
-+mocs: messagereceivertask.moc
+-mocs: connection.moc
++mocs: ssilisttask.moc
  
  #>+ 3
--messagereceivertask.moc: $(srcdir)/messagereceivertask.h
--	$(MOC) $(srcdir)/messagereceivertask.h -o messagereceivertask.moc
-+inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
-+	$(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
+ warningtask.moc: $(srcdir)/warningtask.h
+@@ -1160,10 +1163,10 @@
  
- #>+ 2
--mocs: messagereceivertask.moc
-+mocs: inputprotocolbase.moc
- 
  #>+ 3
  clean-metasources:
--	-rm -f  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc ssiauthtask.moc rateclassmanager.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc rateinfotask.moc snacprotocol.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc closeconnectiontask.moc logintask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc
-+	-rm -f  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc
+-	-rm -f  oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc snacprotocol.moc rateinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc ssilisttask.moc connection.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc buddyicontask.moc
++	-rm -f  oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc buddyicontask.moc
  
  #>+ 2
--KDE_DIST=sendidletimetask.h ssilisttask.h errortask.h coreprotocol.h ownuserinfotask.h icqlogintask.h buffer.h connection.h clientreadytask.h HACKING rtf2html.h locationrightstask.h rateinfotask.h senddcinfotask.h stream.h blmlimitstask.h rateclassmanager.h oscarclientstream.h logintask.h safedelete.h task.h oscarutils.h ssiparamstask.h rtf.ll DESIGN oscarbytestream.h oscartypes.h bytestream.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h transfer.h closeconnectiontask.h profiletask.h flapprotocol.h ssiactivatetask.h serverversionstask.h Makefile.in md5.h connector.h inputprotocolbase.h onlinenotifiertask.h ssimanager.h snacprotocol.h Makefile.am servicesetuptask.h 
-+KDE_DIST=sendidletimetask.h ssilisttask.h errortask.h coreprotocol.h ownuserinfotask.h icqlogintask.h buffer.h connection.h clientreadytask.h HACKING locationrightstask.h rtf2html.h rateinfotask.h senddcinfotask.h stream.h blmlimitstask.h rateclassmanager.h oscarclientstream.h logintask.h safedelete.h task.h oscarutils.h ssiparamstask.h rtf.ll DESIGN oscarbytestream.h bytestream.h oscartypes.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h transfer.h closeconnectiontask.h profiletask.h flapprotocol.h ssiactivatetask.h serverversionstask.h Makefile.in md5.h connector.h inputprotocolbase.h onlinenotifiertask.h ssimanager.h snacprotocol.h Makefile.am servicesetuptask.h 
+-KDE_DIST=sendidletimetask.h ssiauthtask.h ssilisttask.h errortask.h coreprotocol.h typingnotifytask.h ownuserinfotask.h icqlogintask.h userdetails.h clientreadytask.h icquserinfo.h locationrightstask.h rtf2html.h ssimodifytask.h rateinfotask.h rateclassmanager.h blmlimitstask.h changevisibilitytask.h safedelete.h icqtask.h oscarutils.h ssiparamstask.h sendmessagetask.h rtf.ll DESIGN oscartypes.h bytestream.h oscartypeclasses.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h localcontactlisttask.h transfer.h flapprotocol.h oscarsettings.h ssiactivatetask.h Makefile.in serverredirecttask.h md5.h connector.h snacprotocol.h servicesetuptask.h usersearchtask.h buffer.h connection.h warningtask.h HACKING chatservicetask.h icquserinfotask.h senddcinfotask.h stream.h oscarclientstream.h logintask.h buddyicontask.h task.h oscarmessage.h oscarbytestream.h oscardebug.h connectionhandler.h closeconnectiontask.h profiletask.h chatnavservicetask.h offlinemessagestask.h serverversionstask.h messagereceivertask.h onlinenotifiertask.h inputprotocolbase.h ssimanager.h userinfotask.h Makefile.am 
++KDE_DIST=sendidletimetask.h ssiauthtask.h ssilisttask.h errortask.h coreprotocol.h typingnotifytask.h ownuserinfotask.h icqlogintask.h userdetails.h clientreadytask.h icquserinfo.h locationrightstask.h rtf2html.h ssimodifytask.h rateinfotask.h blmlimitstask.h rateclassmanager.h changevisibilitytask.h safedelete.h icqtask.h oscarutils.h ssiparamstask.h sendmessagetask.h rtf.ll DESIGN bytestream.h oscartypes.h oscartypeclasses.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h localcontactlisttask.h prmparamstask.h transfer.h flapprotocol.h oscarsettings.h ssiactivatetask.h Makefile.in serverredirecttask.h md5.h connector.h snacprotocol.h servicesetuptask.h usersearchtask.h buffer.h connection.h warningtask.h HACKING chatservicetask.h icquserinfotask.h senddcinfotask.h stream.h oscarclientstream.h logintask.h buddyicontask.h task.h oscarmessage.h oscarbytestream.h oscardebug.h connectionhandler.h closeconnectiontask.h profiletask.h chatnavservicetask.h offlinemessagestask.h serverversionstask.h messagereceivertask.h onlinenotifiertask.h inputprotocolbase.h ssimanager.h userinfotask.h Makefile.am 
  
  #>+ 3
  clean-closures:
-@@ -1171,7 +1174,7 @@
+@@ -1211,7 +1214,7 @@
  
  
  #>+ 11
--liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/oscarsettings.cpp  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc ssiauthtask.moc rateclassmanager.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc rateinfotask.moc snacprotocol.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc closeconnectiontask.moc logintask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc
-+liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/oscarsettings.cpp  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc
+-liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/oscarmessage.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/buddyicontask.cpp $(srcdir)/serverredirecttask.cpp $(srcdir)/oscarsettings.cpp $(srcdir)/localcontactlisttask.cpp $(srcdir)/chatnavservicetask.cpp $(srcdir)/connectionhandler.cpp $(srcdir)/chatservicetask.cpp  oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc rateinfotask.moc ownuserinfotask.moc snacprotocol.moc safedelete.moc userinfotask.moc icqlogintask.moc ssilisttask.moc connection.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc buddyicontask.moc
++liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/oscarmessage.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/buddyicontask.cpp $(srcdir)/serverredirecttask.cpp $(srcdir)/oscarsettings.cpp $(srcdir)/localcontactlisttask.cpp $(srcdir)/chatnavservicetask.cpp $(srcdir)/connectionhandler.cpp $(srcdir)/chatservicetask.cpp  oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc snacprotocol.moc rateinfotask.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc buddyicontask.moc
  	@echo 'creating liboscar_la.all_cpp.cpp ...'; \
  	rm -f liboscar_la.all_cpp.files liboscar_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
 --- kopete/protocols/oscar/liboscar/tests/Makefile.in
 +++ kopete/protocols/oscar/liboscar/tests/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -275,6 +275,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15309,7 +19975,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -489,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15318,7 +19984,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -527,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15329,53 +19995,62 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstPROGRAMS:
-@@ -733,18 +736,18 @@
- mocs: ssigrouptest.moc
+ clean-checkPROGRAMS:
+@@ -787,13 +790,6 @@
+ .NOEXPORT:
  
  #>+ 3
+-ssigrouptest.moc: $(srcdir)/ssigrouptest.h
+-	$(MOC) $(srcdir)/ssigrouptest.h -o ssigrouptest.moc
+-
+-#>+ 2
+-mocs: ssigrouptest.moc
+-
+-#>+ 3
+ logintest.moc: $(srcdir)/logintest.h
+ 	$(MOC) $(srcdir)/logintest.h -o logintest.moc
+ 
+@@ -801,11 +797,11 @@
+ mocs: logintest.moc
+ 
+ #>+ 3
 -ssitest.moc: $(srcdir)/ssitest.h
 -	$(MOC) $(srcdir)/ssitest.h -o ssitest.moc
-+userinfotest.moc: $(srcdir)/userinfotest.h
-+	$(MOC) $(srcdir)/userinfotest.h -o userinfotest.moc
++ssigrouptest.moc: $(srcdir)/ssigrouptest.h
++	$(MOC) $(srcdir)/ssigrouptest.h -o ssigrouptest.moc
  
  #>+ 2
 -mocs: ssitest.moc
-+mocs: userinfotest.moc
++mocs: ssigrouptest.moc
  
  #>+ 3
--userinfotest.moc: $(srcdir)/userinfotest.h
--	$(MOC) $(srcdir)/userinfotest.h -o userinfotest.moc
+ userinfotest.moc: $(srcdir)/userinfotest.h
+@@ -815,6 +811,13 @@
+ mocs: userinfotest.moc
+ 
+ #>+ 3
 +ssitest.moc: $(srcdir)/ssitest.h
 +	$(MOC) $(srcdir)/ssitest.h -o ssitest.moc
- 
- #>+ 2
--mocs: userinfotest.moc
++
++#>+ 2
 +mocs: ssitest.moc
++
++#>+ 3
+ kunittest.moc: $(srcdir)/kunittest.h
+ 	$(MOC) $(srcdir)/kunittest.h -o kunittest.moc
  
- #>+ 3
- clientstream_test.moc: $(srcdir)/clientstream_test.h
-@@ -755,7 +758,7 @@
+@@ -830,7 +833,7 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  logintest.moc ssigrouptest.moc ssitest.moc userinfotest.moc clientstream_test.moc
-+	-rm -f  logintest.moc ssigrouptest.moc userinfotest.moc ssitest.moc clientstream_test.moc
+-	-rm -f  ssigrouptest.moc logintest.moc ssitest.moc userinfotest.moc kunittest.moc clientstream_test.moc
++	-rm -f  logintest.moc ssigrouptest.moc userinfotest.moc ssitest.moc kunittest.moc clientstream_test.moc
  
  #>+ 2
- KDE_DIST=ssitest.h clientstream_test.h logintest.h ssigrouptest.h Makefile.in userinfotest.h Makefile.am 
-@@ -834,7 +837,7 @@
- logintest.o: logintest.moc 
- logintest.lo: logintest.moc 
- ssitest.o: ssitest.moc 
--ssitest.lo: ssitest.moc 
- clientstream_test.o: clientstream_test.moc 
-+ssitest.lo: ssitest.moc 
- clientstream_test.lo: clientstream_test.moc 
- userinfotest.lo: userinfotest.moc 
+ KDE_DIST=ssitest.h chatnavtests.h clientstream_test.h redirecttest.h logintest.h ssigrouptest.h Makefile.in kunittest.h tester.h ipaddrtest.h ssitest.cpp userinfotest.h Makefile.am 
 --- kopete/protocols/oscar/Makefile.in
 +++ kopete/protocols/oscar/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -258,6 +258,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15385,7 +20060,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -474,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15394,7 +20069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -512,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15408,7 +20083,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/sms/icons/Makefile.in
 +++ kopete/protocols/sms/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15418,7 +20093,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15427,7 +20102,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15439,7 +20114,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -574,21 +577,21 @@
+@@ -586,21 +589,21 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/cr64-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
@@ -15469,7 +20144,7 @@
  force-reedit:
 --- kopete/protocols/sms/Makefile.in
 +++ kopete/protocols/sms/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -262,6 +262,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15479,7 +20154,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15488,7 +20163,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15500,7 +20175,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -935,11 +938,11 @@
+@@ -947,11 +950,11 @@
  mocs: smsaddcontactpage.moc
  
  #>+ 3
@@ -15515,7 +20190,7 @@
  
  #>+ 3
  smscontact.moc: $(srcdir)/smscontact.h
-@@ -949,15 +952,15 @@
+@@ -961,15 +964,15 @@
  mocs: smscontact.moc
  
  #>+ 3
@@ -15534,8 +20209,8 @@
 +	-rm -f  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smseditaccountwidget.moc smscontact.moc smsservice.moc
  
  #>+ 2
- KDE_DIST=smsuserpreferences.h smscontact.h smsprotocol.h smsaddcontactpage.h serviceloader.h smsservice.h Makefile.in smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am 
-@@ -1008,7 +1011,7 @@
+ KDE_DIST=smscontact.h smsaddcontactpage.h serviceloader.h Makefile.in smsuserpreferences.h smsprotocol.h smsservice.h smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am 
+@@ -1020,7 +1023,7 @@
  
  
  #>+ 11
@@ -15546,7 +20221,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
 --- kopete/protocols/sms/services/Makefile.in
 +++ kopete/protocols/sms/services/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15556,7 +20231,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15565,7 +20240,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15579,7 +20254,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/sms/ui/Makefile.in
 +++ kopete/protocols/sms/ui/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15589,7 +20264,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -435,7 +438,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15598,7 +20273,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15612,7 +20287,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/testbed/icons/Makefile.in
 +++ kopete/protocols/testbed/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15622,7 +20297,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15631,7 +20306,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15643,7 +20318,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -572,23 +575,23 @@
+@@ -584,23 +587,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -15678,7 +20353,7 @@
  force-reedit:
 --- kopete/protocols/testbed/Makefile.in
 +++ kopete/protocols/testbed/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15688,7 +20363,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -477,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15697,7 +20372,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -515,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15709,7 +20384,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -915,18 +918,18 @@
+@@ -927,18 +930,18 @@
  mocs: testbedprotocol.moc
  
  #>+ 3
@@ -15734,7 +20409,7 @@
  
  #>+ 3
  testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -951,7 +954,7 @@
+@@ -963,7 +966,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15743,7 +20418,7 @@
  
  #>+ 2
  KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am 
-@@ -1051,8 +1054,8 @@
+@@ -1059,8 +1062,8 @@
  testbedcontact.lo: testbedcontact.moc 
  $(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h 
  testbedcontact.o: testbedcontact.moc 
@@ -15755,7 +20430,7 @@
  testbedaccount.lo: testbedaccount.moc 
 --- kopete/protocols/winpopup/config/Makefile.in
 +++ kopete/protocols/winpopup/config/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15765,7 +20440,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15774,7 +20449,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15788,7 +20463,7 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/winpopup/icons/Makefile.in
 +++ kopete/protocols/winpopup/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15798,7 +20473,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15807,7 +20482,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15819,7 +20494,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -572,26 +575,26 @@
+@@ -584,26 +587,26 @@
  
  #>+ 22
  install-kde-icons:
@@ -15854,7 +20529,7 @@
  force-reedit:
 --- kopete/protocols/winpopup/libwinpopup/Makefile.in
 +++ kopete/protocols/winpopup/libwinpopup/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15864,7 +20539,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -430,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15873,7 +20548,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -468,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15887,7 +20562,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/winpopup/Makefile.in
 +++ kopete/protocols/winpopup/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15897,7 +20572,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15906,7 +20581,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15918,7 +20593,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -938,13 +941,6 @@
+@@ -952,13 +955,6 @@
  mocs: wpaccount.moc
  
  #>+ 3
@@ -15932,7 +20607,7 @@
  wpuserinfo.moc: $(srcdir)/wpuserinfo.h
  	$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
  
-@@ -952,11 +948,11 @@
+@@ -966,11 +962,11 @@
  mocs: wpuserinfo.moc
  
  #>+ 3
@@ -15947,7 +20622,7 @@
  
  #>+ 3
  wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -966,8 +962,15 @@
+@@ -980,8 +976,15 @@
  mocs: wpprotocol.moc
  
  #>+ 3
@@ -15963,8 +20638,8 @@
 +	-rm -f  wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
  
  #>+ 2
- KDE_DIST=wpdebug.h wpuserinfo.h wpeditaccount.h winpopup-send.sh wpaddcontact.h wpprotocol.h wpaccount.h kopete_wp.desktop Makefile.in winpopup-install.sh wpcontact.h Makefile.am 
-@@ -1018,7 +1021,7 @@
+ KDE_DIST=kopete_wp.desktop Makefile.in winpopup-send.sh winpopup-install.sh Makefile.am 
+@@ -1032,7 +1035,7 @@
  
  
  #>+ 11
@@ -15975,7 +20650,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
 --- kopete/protocols/winpopup/ui/Makefile.in
 +++ kopete/protocols/winpopup/ui/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15985,7 +20660,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -436,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15994,7 +20669,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16008,7 +20683,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/yahoo/icons/Makefile.in
 +++ kopete/protocols/yahoo/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16018,7 +20693,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -394,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16027,7 +20702,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16039,7 +20714,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -573,37 +576,37 @@
+@@ -585,37 +588,37 @@
  #>+ 34
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -16093,7 +20768,7 @@
  force-reedit:
 --- kopete/protocols/yahoo/libyahoo2/Makefile.in
 +++ kopete/protocols/yahoo/libyahoo2/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16103,7 +20778,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,7 +419,7 @@
+@@ -433,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -16112,7 +20787,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +457,9 @@
+@@ -471,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16126,7 +20801,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/yahoo/Makefile.in
 +++ kopete/protocols/yahoo/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -275,6 +275,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16136,7 +20811,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -491,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16145,7 +20820,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -529,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16157,52 +20832,55 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -909,18 +912,18 @@
- mocs: yahooprotocol.moc
+@@ -964,13 +967,6 @@
+ mocs: yahoouserinfo.moc
  
  #>+ 3
--yahooconferencemessagemanager.moc: $(srcdir)/yahooconferencemessagemanager.h
--	$(MOC) $(srcdir)/yahooconferencemessagemanager.h -o yahooconferencemessagemanager.moc
-+yahooaccount.moc: $(srcdir)/yahooaccount.h
-+	$(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
+-yahoobuddyiconloader.moc: $(srcdir)/yahoobuddyiconloader.h
+-	$(MOC) $(srcdir)/yahoobuddyiconloader.h -o yahoobuddyiconloader.moc
+-
+-#>+ 2
+-mocs: yahoobuddyiconloader.moc
+-
+-#>+ 3
+ yahoocontact.moc: $(srcdir)/yahoocontact.h
+ 	$(MOC) $(srcdir)/yahoocontact.h -o yahoocontact.moc
  
- #>+ 2
--mocs: yahooconferencemessagemanager.moc
-+mocs: yahooaccount.moc
+@@ -985,6 +981,13 @@
+ mocs: kyahoo.moc
  
  #>+ 3
--yahooaccount.moc: $(srcdir)/yahooaccount.h
--	$(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
-+yahooconferencemessagemanager.moc: $(srcdir)/yahooconferencemessagemanager.h
-+	$(MOC) $(srcdir)/yahooconferencemessagemanager.h -o yahooconferencemessagemanager.moc
++yahoobuddyiconloader.moc: $(srcdir)/yahoobuddyiconloader.h
++	$(MOC) $(srcdir)/yahoobuddyiconloader.h -o yahoobuddyiconloader.moc
++
++#>+ 2
++mocs: yahoobuddyiconloader.moc
++
++#>+ 3
+ yahooeditaccount.moc: $(srcdir)/yahooeditaccount.h
+ 	$(MOC) $(srcdir)/yahooeditaccount.h -o yahooeditaccount.moc
  
- #>+ 2
--mocs: yahooaccount.moc
-+mocs: yahooconferencemessagemanager.moc
+@@ -1021,7 +1024,7 @@
  
  #>+ 3
- yahooaddcontact.moc: $(srcdir)/yahooaddcontact.h
-@@ -945,7 +948,7 @@
- 
- #>+ 3
  clean-metasources:
--	-rm -f  yahooeditaccount.moc yahooprotocol.moc yahooconferencemessagemanager.moc yahooaccount.moc yahooaddcontact.moc yahoocontact.moc kyahoo.moc
-+	-rm -f  yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc yahoocontact.moc kyahoo.moc
+-	-rm -f  yahooconferencemessagemanager.moc yahoouserinfo.moc yahoobuddyiconloader.moc yahoocontact.moc kyahoo.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
++	-rm -f  yahooconferencemessagemanager.moc yahoouserinfo.moc yahoocontact.moc kyahoo.moc yahoobuddyiconloader.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
  
  #>+ 2
- KDE_DIST=yahooconferencemessagemanager.h yahooaccount.h yahooprotocol.h yahoocontact.h yahooaddcontact.h yahooeditaccount.h kopete_yahoo.desktop Makefile.in kyahoo.h Makefile.am 
-@@ -996,7 +999,7 @@
+ KDE_DIST=yahoochatui.rc yahooprotocol.h yahoocontact.h yahooeditaccount.h Makefile.in kyahoo.h yahooconferencemessagemanager.h yahooaccount.h yahooaddcontact.h kopete_yahoo.desktop Makefile.am 
+@@ -1072,7 +1075,7 @@
  
  
  #>+ 11
--kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp  yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc kyahoo.moc yahoocontact.moc
-+kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp  yahooeditaccount.moc yahooprotocol.moc yahooconferencemessagemanager.moc yahooaccount.moc yahooaddcontact.moc kyahoo.moc yahoocontact.moc
+-kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoouserinfo.cpp $(srcdir)/yahoobuddyiconloader.cpp $(srcdir)/yahoochatsession.cpp  yahooconferencemessagemanager.moc yahoouserinfo.moc kyahoo.moc yahoocontact.moc yahoobuddyiconloader.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
++kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoouserinfo.cpp $(srcdir)/yahoobuddyiconloader.cpp $(srcdir)/yahoochatsession.cpp  yahooconferencemessagemanager.moc yahoouserinfo.moc yahoobuddyiconloader.moc kyahoo.moc yahoocontact.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
  	@echo 'creating kopete_yahoo_la.all_cpp.cpp ...'; \
  	rm -f kopete_yahoo_la.all_cpp.files kopete_yahoo_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
 --- kopete/protocols/yahoo/ui/Makefile.in
 +++ kopete/protocols/yahoo/ui/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16212,7 +20890,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -443,7 +446,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16221,7 +20899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -481,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16235,7 +20913,7 @@
  clean-noinstLTLIBRARIES:
 --- kopete/sounds/Makefile.in
 +++ kopete/sounds/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16245,7 +20923,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -404,7 +407,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16254,7 +20932,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -442,9 +445,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16268,7 +20946,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/Adium/Makefile.in
 +++ kopete/styles/data/Adium/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16278,7 +20956,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16287,7 +20965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16301,7 +20979,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/From/Makefile.in
 +++ kopete/styles/data/iChat/blue/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16311,7 +20989,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16320,7 +20998,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16334,7 +21012,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/Makefile.in
 +++ kopete/styles/data/iChat/blue/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16344,7 +21022,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16353,7 +21031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16367,7 +21045,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/To/Makefile.in
 +++ kopete/styles/data/iChat/blue/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16377,7 +21055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16386,7 +21064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16400,7 +21078,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/From/Makefile.in
 +++ kopete/styles/data/iChat/clear/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16410,7 +21088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16419,7 +21097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16433,7 +21111,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/Makefile.in
 +++ kopete/styles/data/iChat/clear/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16443,7 +21121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16452,7 +21130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16466,7 +21144,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/To/Makefile.in
 +++ kopete/styles/data/iChat/clear/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16476,7 +21154,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16485,7 +21163,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16499,7 +21177,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/From/Makefile.in
 +++ kopete/styles/data/iChat/graphite/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16509,7 +21187,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16518,7 +21196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16532,7 +21210,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/Makefile.in
 +++ kopete/styles/data/iChat/graphite/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16542,7 +21220,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16551,7 +21229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16565,7 +21243,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/To/Makefile.in
 +++ kopete/styles/data/iChat/graphite/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16575,7 +21253,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16584,7 +21262,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16598,7 +21276,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/From/Makefile.in
 +++ kopete/styles/data/iChat/green/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16608,7 +21286,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16617,7 +21295,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16631,7 +21309,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/Makefile.in
 +++ kopete/styles/data/iChat/green/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16641,7 +21319,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16650,7 +21328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16664,7 +21342,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/To/Makefile.in
 +++ kopete/styles/data/iChat/green/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16674,7 +21352,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16683,7 +21361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16697,7 +21375,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/Makefile.in
 +++ kopete/styles/data/iChat/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16707,7 +21385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16716,7 +21394,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16730,7 +21408,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/From/Makefile.in
 +++ kopete/styles/data/iChat/orange/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16740,7 +21418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16749,7 +21427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16763,7 +21441,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/Makefile.in
 +++ kopete/styles/data/iChat/orange/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16773,7 +21451,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16782,7 +21460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16796,7 +21474,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/To/Makefile.in
 +++ kopete/styles/data/iChat/orange/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16806,7 +21484,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16815,7 +21493,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16829,7 +21507,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/From/Makefile.in
 +++ kopete/styles/data/iChat/pink/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16839,7 +21517,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16848,7 +21526,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16862,7 +21540,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/Makefile.in
 +++ kopete/styles/data/iChat/pink/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16872,7 +21550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16881,7 +21559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16895,7 +21573,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/To/Makefile.in
 +++ kopete/styles/data/iChat/pink/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16905,7 +21583,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16914,7 +21592,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16928,7 +21606,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/From/Makefile.in
 +++ kopete/styles/data/iChat/purple/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16938,7 +21616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16947,7 +21625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16961,7 +21639,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/Makefile.in
 +++ kopete/styles/data/iChat/purple/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16971,7 +21649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16980,7 +21658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16994,7 +21672,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/To/Makefile.in
 +++ kopete/styles/data/iChat/purple/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17004,7 +21682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17013,7 +21691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17027,7 +21705,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/From/Makefile.in
 +++ kopete/styles/data/iChat/yellow/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17037,7 +21715,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17046,7 +21724,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17060,7 +21738,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/Makefile.in
 +++ kopete/styles/data/iChat/yellow/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17070,7 +21748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17079,7 +21757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17093,7 +21771,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/To/Makefile.in
 +++ kopete/styles/data/iChat/yellow/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17103,7 +21781,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17112,7 +21790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17126,7 +21804,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17136,7 +21814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17145,7 +21823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17159,7 +21837,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17169,7 +21847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17178,7 +21856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17192,7 +21870,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17202,7 +21880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17211,7 +21889,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17225,7 +21903,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17235,7 +21913,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17244,7 +21922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17258,7 +21936,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17268,7 +21946,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17277,7 +21955,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17291,7 +21969,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17301,7 +21979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17310,7 +21988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17324,7 +22002,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17334,7 +22012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17343,7 +22021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17357,7 +22035,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17367,7 +22045,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17376,7 +22054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17390,7 +22068,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17400,7 +22078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17409,7 +22087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17423,7 +22101,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17433,7 +22111,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17442,7 +22120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17456,7 +22134,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17466,7 +22144,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17475,7 +22153,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17489,7 +22167,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17499,7 +22177,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17508,7 +22186,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17522,7 +22200,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/Makefile.in
 +++ kopete/styles/data/iChat-Trans/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17532,7 +22210,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17541,7 +22219,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17555,7 +22233,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17565,7 +22243,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17574,7 +22252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17588,7 +22266,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17598,7 +22276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17607,7 +22285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17621,7 +22299,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17631,7 +22309,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17640,7 +22318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17654,7 +22332,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17664,7 +22342,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17673,7 +22351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17687,7 +22365,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17697,7 +22375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17706,7 +22384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17720,7 +22398,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17730,7 +22408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17739,7 +22417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17753,7 +22431,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17763,7 +22441,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17772,7 +22450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17786,7 +22464,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17796,7 +22474,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17805,7 +22483,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17819,7 +22497,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17829,7 +22507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17838,7 +22516,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17852,7 +22530,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17862,7 +22540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17871,7 +22549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17885,7 +22563,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17895,7 +22573,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -422,7 +425,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17904,7 +22582,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17918,7 +22596,7 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17928,7 +22606,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17937,7 +22615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17949,9 +22627,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- kopete/styles/data/Kopete/Makefile.in
++++ kopete/styles/data/Kopete/Makefile.in
+@@ -206,6 +206,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -405,7 +408,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -443,9 +446,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kopete/styles/data/Makefile.in
 +++ kopete/styles/data/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17961,7 +22672,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17970,7 +22681,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17984,7 +22695,7 @@
  mostlyclean-libtool:
 --- kopete/styles/Makefile.in
 +++ kopete/styles/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17994,7 +22705,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -434,7 +437,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18003,7 +22714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18017,7 +22728,7 @@
  mostlyclean-libtool:
 --- kpf/Makefile.in
 +++ kpf/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -224,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18027,7 +22738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -427,7 +430,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18036,7 +22747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -465,9 +468,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18048,7 +22759,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -793,17 +796,17 @@
+@@ -805,17 +808,17 @@
  
  #>+ 13
  install-kde-icons:
@@ -18074,7 +22785,7 @@
  force-reedit:
 --- kpf/src/Makefile.in
 +++ kpf/src/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -269,6 +269,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18084,7 +22795,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18093,7 +22804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18105,7 +22816,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -930,13 +933,6 @@
+@@ -942,13 +945,6 @@
  
  
  #>+ 3
@@ -18119,7 +22830,7 @@
  Server.moc: $(srcdir)/Server.h
  	$(MOC) $(srcdir)/Server.h -o Server.moc
  
-@@ -965,81 +961,88 @@
+@@ -977,81 +973,88 @@
  mocs: Applet.moc
  
  #>+ 3
@@ -18241,7 +22952,7 @@
  
  #>+ 3
  WebServerManager_stub.h: WebServerManager.kidl
-@@ -1056,7 +1059,7 @@
+@@ -1068,7 +1071,7 @@
  
  #>+ 3
  clean-metasources:
@@ -18249,8 +22960,8 @@
 +	-rm -f  Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc StartingKPFDialog.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc PropertiesDialogPlugin.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
  
  #>+ 2
- KDE_DIST=Defines.h KPFInterface.h System.h Makefile.in KPFInterface.cpp Makefile.am 
-@@ -1116,7 +1119,7 @@
+ KDE_DIST=KPFInterface.h System.h Makefile.in Defines.h KPFInterface.cpp Makefile.am 
+@@ -1128,7 +1131,7 @@
  
  
  #>+ 11
@@ -18259,7 +22970,7 @@
  	@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
-@@ -1128,7 +1131,7 @@
+@@ -1140,7 +1143,7 @@
  	rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
  
  #>+ 11
@@ -18268,7 +22979,7 @@
  	@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
  	rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
-@@ -1176,8 +1179,8 @@
+@@ -1184,8 +1187,8 @@
  $(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h 
  ActiveMonitor.o: ActiveMonitor.moc 
  SingleServerConfigDialog.lo: SingleServerConfigDialog.moc 
@@ -18280,7 +22991,7 @@
  $(srcdir)/PortValidator.cpp: WebServer_stub.h 
 --- kppp/DB/Makefile.in
 +++ kppp/DB/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18290,7 +23001,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18299,7 +23010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18313,7 +23024,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Austria/Makefile.in
 +++ kppp/DB/Provider/Austria/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18323,7 +23034,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18332,7 +23043,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18346,7 +23057,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Belarus/Makefile.in
 +++ kppp/DB/Provider/Belarus/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18356,7 +23067,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18365,7 +23076,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18379,7 +23090,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Czech_Republic/Makefile.in
 +++ kppp/DB/Provider/Czech_Republic/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18389,7 +23100,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -419,7 +422,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18398,7 +23109,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -457,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18410,18 +23121,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -606,7 +609,7 @@
+@@ -618,7 +621,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=HP-NET CITYNET AICOM Econnect SeverNET M-soft ARsystem Brailcom ASYS IQNET Falco_computer Nextra ProfiNet Contactel Volny INTERNET_OnLine BohemiaNet Fortech Makefile.in KPNQuest ApexNet Video_OnLine INTERNEXT Makefile.am ES-servis 
-+KDE_DIST=HP-NET CITYNET AICOM Econnect SeverNET M-soft ARsystem Brailcom ASYS IQNET Falco_computer Nextra ProfiNet Contactel Volny INTERNET_OnLine BohemiaNet Fortech Makefile.in KPNQuest ApexNet Video_OnLine INTERNEXT ES-servis Makefile.am 
+-KDE_DIST=HP-NET AICOM Econnect ARsystem Falco_computer Nextra ProfiNet Contactel Fortech Makefile.in Video_OnLine INTERNEXT CITYNET SeverNET M-soft Brailcom ASYS IQNET Volny INTERNET_OnLine BohemiaNet KPNQuest ApexNet Makefile.am ES-servis 
++KDE_DIST=HP-NET AICOM Econnect ARsystem Falco_computer Nextra ProfiNet Contactel Fortech Makefile.in Video_OnLine INTERNEXT CITYNET SeverNET M-soft Brailcom ASYS IQNET Volny INTERNET_OnLine BohemiaNet KPNQuest ApexNet ES-servis Makefile.am 
  
  #>+ 2
  docs-am:
 --- kppp/DB/Provider/Denmark/Makefile.in
 +++ kppp/DB/Provider/Denmark/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18431,7 +23142,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18440,7 +23151,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18454,7 +23165,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/France/Makefile.in
 +++ kppp/DB/Provider/France/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18464,7 +23175,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18473,7 +23184,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18487,7 +23198,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Germany/Makefile.in
 +++ kppp/DB/Provider/Germany/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18497,7 +23208,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18506,7 +23217,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18520,7 +23231,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Ireland/Makefile.in
 +++ kppp/DB/Provider/Ireland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18530,7 +23241,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18539,7 +23250,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18553,7 +23264,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Makefile.in
 +++ kppp/DB/Provider/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18563,7 +23274,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -412,7 +415,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18572,7 +23283,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -450,9 +453,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18586,7 +23297,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Netherlands/Makefile.in
 +++ kppp/DB/Provider/Netherlands/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18596,7 +23307,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -467,7 +470,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18605,7 +23316,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -505,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18617,18 +23328,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -656,7 +659,7 @@
+@@ -666,7 +669,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Euronet%032anytime Euronet%032professional IAE Zon%032Gratis Cybercomm Planet%032Internet%032Standaard Interstroom Tiscali%032Compleet Wannadoo%032smartpack Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Zon%032Inclusief Nederland.net Freeler%032basis Kabelfoon Via%032Networks Freeler%032compleet 12Move UwNet Hacom Betuwenet%032BQuality Demon%032Internet Cistron KeyAcces%032met%0323%032cijferig%032kengetal Popin Zon%0322 XS4All Wannadoo%032budget Bart FlakkeeNet Solcon ILimburg InterNLnet Plant%032Acces Internet%032Online Daxis%032Internet Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Avades Raketnet HCC%032NET Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus HetNet%032Basis%032Surfen Tiscali%032Gratis Support%032Net Macom Dataweb Telebyte Interbox HetNet%032Frequent%032Surfen Makefile.am Betuwenet%032BFree Energis-Ision IntroWeb%032met%0323-cijferig%032kengetal 
-+KDE_DIST=Euronet%032anytime Euronet%032professional IAE Zon%032Gratis Cybercomm Interstroom Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Zon%032Inclusief Nederland.net Freeler%032basis Via%032Networks Kabelfoon Freeler%032compleet 12Move UwNet Hacom Betuwenet%032BQuality Demon%032Internet Cistron KeyAcces%032met%0323%032cijferig%032kengetal Popin Zon%0322 XS4All Wannadoo%032budget Bart FlakkeeNet Solcon ILimburg InterNLnet Plant%032Acces Internet%032Online Daxis%032Internet Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet Avades HCC%032NET Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium HetNet%032Basis%032Surfen Wannadoo%032budget%320plus Support%032Net Tiscali%032Gratis Dataweb Macom Telebyte Interbox HetNet%032Frequent%032Surfen Makefile.am Betuwenet%032BFree IntroWeb%032met%0323-cijferig%032kengetal Energis-Ision 
+-KDE_DIST=Euronet%032anytime Euronet%032professional IAE Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Zon%032Inclusief Kabelfoon Freeler%032compleet UwNet Hacom Betuwenet%032BQuality Demon%032Internet Popin FlakkeeNet Solcon ILimburg Daxis%032Internet Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus Support%032Net Macom Interbox Betuwenet%032BFree Zon%032Gratis Interstroom Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Nederland.net Freeler%032basis Via%032Networks 12Move Cistron KeyAcces%032met%0323%032cijferig%032kengetal XS4All Zon%0322 Wannadoo%032budget Bart InterNLnet Plant%032Acces Internet%032Online Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet HCC%032NET HetNet%032Basis%032Surfen Tiscali%032Gratis Dataweb Telebyte HetNet%032Frequent%032Surfen Makefile.am Energis-Ision IntroWeb%032met%0323-cijferig%032kengetal 
++KDE_DIST=Euronet%032anytime Euronet%032professional IAE Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Zon%032Inclusief Kabelfoon Freeler%032compleet UwNet Hacom Betuwenet%032BQuality Demon%032Internet Popin FlakkeeNet Solcon ILimburg Daxis%032Internet Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus Support%032Net Macom Interbox Betuwenet%032BFree Zon%032Gratis Interstroom Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Nederland.net Freeler%032basis Via%032Networks 12Move Cistron KeyAcces%032met%0323%032cijferig%032kengetal Zon%0322 XS4All Wannadoo%032budget Bart InterNLnet Plant%032Acces Internet%032Online Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet HCC%032NET HetNet%032Basis%032Surfen Tiscali%032Gratis Dataweb Telebyte HetNet%032Frequent%032Surfen Makefile.am IntroWeb%032met%0323-cijferig%032kengetal Energis-Ision 
  
  #>+ 2
  docs-am:
 --- kppp/DB/Provider/New_Zealand/Makefile.in
 +++ kppp/DB/Provider/New_Zealand/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18638,7 +23349,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18647,7 +23358,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18659,18 +23370,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -592,7 +595,7 @@
+@@ -604,7 +607,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=ihug Voyager Paradise Makefile.in XTRA OrconInternet Makefile.am 
-+KDE_DIST=ihug Voyager Paradise Makefile.in OrconInternet XTRA Makefile.am 
+-KDE_DIST=ihug Makefile.in Voyager Paradise XTRA OrconInternet Makefile.am 
++KDE_DIST=ihug Makefile.in Voyager Paradise OrconInternet XTRA Makefile.am 
  
  #>+ 2
  docs-am:
 --- kppp/DB/Provider/Norway/Makefile.in
 +++ kppp/DB/Provider/Norway/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18680,7 +23391,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18689,7 +23400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18703,7 +23414,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Portugal/Makefile.in
 +++ kppp/DB/Provider/Portugal/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18713,7 +23424,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18722,7 +23433,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18736,7 +23447,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Slovenia/Makefile.in
 +++ kppp/DB/Provider/Slovenia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18746,7 +23457,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18755,7 +23466,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18767,18 +23478,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -592,7 +595,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=MojNet Kiss Volja Makefile.in Arnes SiOL AmisNet Makefile.am 
-+KDE_DIST=MojNet Kiss Volja Makefile.in Arnes AmisNet SiOL Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/DB/Provider/Sweden/Makefile.in
 +++ kppp/DB/Provider/Sweden/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18788,7 +23490,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18797,7 +23499,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18811,7 +23513,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Switzerland/Makefile.in
 +++ kppp/DB/Provider/Switzerland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18821,7 +23523,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18830,7 +23532,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18844,7 +23546,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Taiwan/Makefile.in
 +++ kppp/DB/Provider/Taiwan/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18854,7 +23556,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18863,7 +23565,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18877,7 +23579,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Ukraine/Makefile.in
 +++ kppp/DB/Provider/Ukraine/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18887,7 +23589,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18896,7 +23598,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18910,7 +23612,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/United_Kingdom/Makefile.in
 +++ kppp/DB/Provider/United_Kingdom/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18920,7 +23622,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18929,7 +23631,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18943,7 +23645,7 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Yugoslavia/Makefile.in
 +++ kppp/DB/Provider/Yugoslavia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18953,7 +23655,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -414,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18962,7 +23664,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -452,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18974,18 +23676,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -601,7 +604,7 @@
+@@ -613,7 +616,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=TippNet CG.BijeloPolje.CG.yu CG.Budva.yu CG.Podgorica.yu CG.yu DrenikNet EUnetPristina CG.Bar.yu EUnetS SuOnline BeoTelNet CG.Berane.yu CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full YUBCnet EUnetKragujevac CG.Cetinje.yu EUnetNoviSad CG.Tivat.yu CG.Kotor.yu EUnetBeograd CG.Niksic.yu VeratNet PTT Makefile.in CG.HercegNovi.yu EUnetSombor 041Net SCnet EUnetSubotica Makefile.am Sezampro EUnetCacak CG.Pljevlja.yu EUnetNis 
-+KDE_DIST=TippNet CG.BijeloPolje.CG.yu CG.Budva.yu CG.Podgorica.yu CG.yu DrenikNet EUnetPristina CG.Bar.yu EUnetS SuOnline BeoTelNet CG.Berane.yu CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full YUBCnet EUnetKragujevac CG.Cetinje.yu EUnetNoviSad CG.Tivat.yu CG.Kotor.yu EUnetBeograd VeratNet CG.Niksic.yu PTT Makefile.in CG.HercegNovi.yu 041Net EUnetSombor SCnet EUnetSubotica Sezampro Makefile.am EUnetCacak EUnetNis CG.Pljevlja.yu 
+-KDE_DIST=CG.Budva.yu EUnetPristina CG.Bar.yu EUnetS CG.Berane.yu YUBCnet CG.Cetinje.yu EUnetNoviSad CG.Kotor.yu EUnetBeograd CG.Niksic.yu VeratNet PTT Makefile.in EUnetSombor 041Net Sezampro CG.Pljevlja.yu EUnetNis TippNet CG.BijeloPolje.CG.yu CG.Podgorica.yu CG.yu DrenikNet SuOnline BeoTelNet CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full EUnetKragujevac CG.Tivat.yu CG.HercegNovi.yu SCnet EUnetSubotica Makefile.am EUnetCacak 
++KDE_DIST=CG.Budva.yu EUnetPristina CG.Bar.yu EUnetS CG.Berane.yu YUBCnet CG.Cetinje.yu EUnetNoviSad CG.Kotor.yu EUnetBeograd VeratNet CG.Niksic.yu PTT Makefile.in 041Net EUnetSombor Sezampro EUnetNis CG.Pljevlja.yu TippNet CG.BijeloPolje.CG.yu CG.Podgorica.yu CG.yu DrenikNet SuOnline BeoTelNet CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full EUnetKragujevac CG.Tivat.yu CG.HercegNovi.yu SCnet EUnetSubotica Makefile.am EUnetCacak 
  
  #>+ 2
  docs-am:
 --- kppp/icons/Makefile.in
 +++ kppp/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18995,7 +23697,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -393,7 +396,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19004,7 +23706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -431,9 +434,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19016,42 +23718,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -571,23 +574,23 @@
+@@ -583,26 +586,26 @@
  
- #>+ 19
+ #>+ 22
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kppp.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kppp.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kppp.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kppp.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kppp.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kppp.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kppp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kppp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
  
  #>+ 15
  force-reedit:
 --- kppp/logview/Makefile.in
 +++ kppp/logview/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19061,7 +23766,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19070,7 +23775,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19084,7 +23789,7 @@
  	@$(NORMAL_INSTALL)
 --- kppp/Makefile.in
 +++ kppp/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -283,6 +283,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19094,7 +23799,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19103,7 +23808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19117,7 +23822,7 @@
  	@$(NORMAL_INSTALL)
 --- kppp/pixmaps/Makefile.in
 +++ kppp/pixmaps/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19127,7 +23832,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -411,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19136,7 +23841,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -449,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19150,7 +23855,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Argentina/Makefile.in
 +++ kppp/Rules/Argentina/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19160,7 +23865,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19169,7 +23874,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19183,7 +23888,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Australia/Makefile.in
 +++ kppp/Rules/Australia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19193,7 +23898,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -411,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19202,7 +23907,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -449,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19216,7 +23921,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Business_1/Makefile.in
 +++ kppp/Rules/Austria/Business_1/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19226,7 +23931,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19235,7 +23940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19249,7 +23954,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Business_2/Makefile.in
 +++ kppp/Rules/Austria/Business_2/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19259,7 +23964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19268,7 +23973,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19282,7 +23987,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Makefile.in
 +++ kppp/Rules/Austria/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19292,7 +23997,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -413,7 +416,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19301,7 +24006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19315,7 +24020,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Minimum/Makefile.in
 +++ kppp/Rules/Austria/Minimum/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19325,7 +24030,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19334,7 +24039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19348,7 +24053,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Standard/Makefile.in
 +++ kppp/Rules/Austria/Standard/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19358,7 +24063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19367,7 +24072,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19381,7 +24086,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Bangladesh/Makefile.in
 +++ kppp/Rules/Bangladesh/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19391,7 +24096,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19400,7 +24105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19414,7 +24119,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Belgium/Makefile.in
 +++ kppp/Rules/Belgium/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19424,7 +24129,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19433,7 +24138,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19447,7 +24152,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
 +++ kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19457,7 +24162,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19466,7 +24171,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19480,7 +24185,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Brasil/Makefile.in
 +++ kppp/Rules/Brasil/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19490,7 +24195,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19499,7 +24204,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19513,7 +24218,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Croatia/Makefile.in
 +++ kppp/Rules/Croatia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19523,7 +24228,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19532,7 +24237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19546,7 +24251,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Czechia/Makefile.in
 +++ kppp/Rules/Czechia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19556,7 +24261,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19565,7 +24270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19577,18 +24282,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -597,7 +600,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst Czech_Telecom_Internet_2004_telefon_universal.rst Makefile.in Czech_Telecom_Internet_2004_Home_Internet.rst Czech_Telecom_Internet_2004_Business_Internet.rst Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst Makefile.am 
-+KDE_DIST=Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst Czech_Telecom_Internet_2004_telefon_universal.rst Makefile.in Czech_Telecom_Internet_2004_Home_Internet.rst Czech_Telecom_Internet_2004_Business_Internet.rst Makefile.am Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Denmark/Makefile.in
 +++ kppp/Rules/Denmark/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19598,7 +24294,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -411,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19607,7 +24303,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -449,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19619,18 +24315,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -598,7 +601,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Worldonline-ISDN.rst 12Move_ISDN.rst Get2net_Gratis.rst 12Move_Analog.rst Worldonline-Analog.rst Teledanmark_Basis.rst Cybercity_Friabonnement.rst Mobilix_Wanadoo.rst Makefile.in Teledanmark_Favoritinternet.rst Get2net_Betaling.rst Makefile.am 
-+KDE_DIST=Worldonline-ISDN.rst 12Move_ISDN.rst Get2net_Gratis.rst 12Move_Analog.rst Worldonline-Analog.rst Teledanmark_Basis.rst Cybercity_Friabonnement.rst Mobilix_Wanadoo.rst Teledanmark_Favoritinternet.rst Makefile.in Get2net_Betaling.rst Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Estonia/Makefile.in
 +++ kppp/Rules/Estonia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19640,7 +24327,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19649,7 +24336,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19663,7 +24350,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Finland/Makefile.in
 +++ kppp/Rules/Finland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19673,7 +24360,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19682,7 +24369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19696,7 +24383,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/France/Makefile.in
 +++ kppp/Rules/France/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19706,7 +24393,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19715,7 +24402,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19729,7 +24416,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Germany/Makefile.in
 +++ kppp/Rules/Germany/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19739,7 +24426,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -434,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19748,7 +24435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19760,18 +24447,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -621,7 +624,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Nikoma_Study_and_Surf.rst Nikoma.rst 1und1_InternetZugang.rst Freenet_StandardTarif.rst Freenet_Enterprise.rst Mobilcom_Freenet.rst E-Plus-Online_Jedermann.rst Freenet_special_call_by_call.rst AddCom_by_Call.rst CallOkaynet.rst vossnet_fun_light.rst Puretec.rst Callino_Surf_Basic.rst Freenet_Super_CbC.rst 2.5min.rst vossnet_fun.rst vossnet_kompl.rst talkline_by_call.rst knUUt-by-Call.rst Planet-Interkom_Internet_by_call.rst Callisa_City.rst Netcom_Kassel.rst MSN.rst Nikoma_Internet_by_Call.rst expressnet.rst 2.5s.rst VR-Web.rst Freenet_Sorglos.rst Arcor_Internet_by_Call_easy.rst Addcom.rst Makefile.in NGI_Call_By_Call.rst CompuservePro.rst Cityweb.rst City_Activ_Plus_Option.rst Telekom_City_Select_5_30.rst Easynet_easy-call.rst Makefile.am Callino_Surf_Plus.rst 
-+KDE_DIST=Nikoma_Study_and_Surf.rst Nikoma.rst 1und1_InternetZugang.rst Freenet_StandardTarif.rst Freenet_Enterprise.rst Mobilcom_Freenet.rst E-Plus-Online_Jedermann.rst Freenet_special_call_by_call.rst AddCom_by_Call.rst CallOkaynet.rst vossnet_fun_light.rst Puretec.rst Callino_Surf_Basic.rst Freenet_Super_CbC.rst 2.5min.rst vossnet_fun.rst vossnet_kompl.rst talkline_by_call.rst knUUt-by-Call.rst Planet-Interkom_Internet_by_call.rst Netcom_Kassel.rst Callisa_City.rst MSN.rst Nikoma_Internet_by_Call.rst expressnet.rst 2.5s.rst VR-Web.rst Freenet_Sorglos.rst Arcor_Internet_by_Call_easy.rst Addcom.rst Makefile.in NGI_Call_By_Call.rst CompuservePro.rst Cityweb.rst City_Activ_Plus_Option.rst Telekom_City_Select_5_30.rst Easynet_easy-call.rst Makefile.am Callino_Surf_Plus.rst 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Greece/Makefile.in
 +++ kppp/Rules/Greece/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19781,7 +24459,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19790,7 +24468,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19804,7 +24482,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/HongKong/Makefile.in
 +++ kppp/Rules/HongKong/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19814,7 +24492,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19823,7 +24501,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19837,7 +24515,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Hungary/Makefile.in
 +++ kppp/Rules/Hungary/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19847,7 +24525,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19856,7 +24534,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19870,7 +24548,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Iceland/Makefile.in
 +++ kppp/Rules/Iceland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19880,7 +24558,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19889,7 +24567,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19901,7 +24579,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -592,7 +595,7 @@
+@@ -604,7 +607,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -19912,7 +24590,7 @@
  docs-am:
 --- kppp/Rules/India/Makefile.in
 +++ kppp/Rules/India/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19922,7 +24600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19931,7 +24609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19945,7 +24623,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Indonesia/Makefile.in
 +++ kppp/Rules/Indonesia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19955,7 +24633,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19964,7 +24642,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19976,18 +24654,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -595,7 +598,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Lokal_1_Metropolitan.rst Makefile.in Lokal_2_Metropolitan.rst Makefile.am Lokal_non_metropolitan.rst 
-+KDE_DIST=Lokal_1_Metropolitan.rst Makefile.in Lokal_2_Metropolitan.rst Lokal_non_metropolitan.rst Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Ireland/Makefile.in
 +++ kppp/Rules/Ireland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19997,7 +24666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20006,7 +24675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20020,7 +24689,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Israel/Makefile.in
 +++ kppp/Rules/Israel/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20030,7 +24699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20039,7 +24708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20053,7 +24722,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Italy/Makefile.in
 +++ kppp/Rules/Italy/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20063,7 +24732,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -434,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20072,7 +24741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20084,18 +24753,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -621,7 +624,7 @@
+@@ -633,7 +636,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
-+KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
+-KDE_DIST=Wind_Family_Internet_InWind.rst Wind_Urbana_1088_Light.rst Wind_24ore_Urbane.rst Infostrada_Internet_SpZero.rst Infostrada_Libero1055_Base.rst Telecom_Interurbane_Oltre15Km.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Infostrada_Reg_Naz_Base.rst Tele2_Altri_ISP.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Telecom_Locali.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
++KDE_DIST=Wind_Family_Internet_InWind.rst Wind_Urbana_1088_Light.rst Wind_24ore_Urbane.rst Infostrada_Internet_SpZero.rst Infostrada_Libero1055_Base.rst Telecom_Interurbane_Oltre15Km.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Infostrada_Reg_Naz_Base.rst Tele2_Altri_ISP.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Telecom_Locali.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
  
  #>+ 2
  docs-am:
 --- kppp/Rules/Jamaica/Makefile.in
 +++ kppp/Rules/Jamaica/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20105,7 +24774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20114,7 +24783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20128,7 +24797,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Japan/Makefile.in
 +++ kppp/Rules/Japan/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20138,7 +24807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20147,7 +24816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20161,7 +24830,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Kazakhstan/Makefile.in
 +++ kppp/Rules/Kazakhstan/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20171,7 +24840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20180,7 +24849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20194,7 +24863,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Luxembourg/Makefile.in
 +++ kppp/Rules/Luxembourg/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20204,7 +24873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20213,7 +24882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20227,7 +24896,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Macedonia/Makefile.in
 +++ kppp/Rules/Macedonia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20237,7 +24906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20246,7 +24915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20260,7 +24929,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Makefile.in
 +++ kppp/Rules/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20270,7 +24939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -418,7 +421,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
@@ -20279,7 +24948,7 @@
  pkg_DATA = TEMPLATE
  pkg_SCRIPTS = checkrules
  pkgdir = $(kde_datadir)/kppp/Rules
-@@ -416,7 +419,7 @@
+@@ -428,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20288,7 +24957,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +457,9 @@
+@@ -466,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20302,7 +24971,7 @@
  	@$(NORMAL_INSTALL)
 --- kppp/Rules/Malaysia/Makefile.in
 +++ kppp/Rules/Malaysia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20312,7 +24981,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20321,7 +24990,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20335,7 +25004,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Netherlands/Makefile.in
 +++ kppp/Rules/Netherlands/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20345,7 +25014,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -434,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20354,7 +25023,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20366,18 +25035,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -621,7 +624,7 @@
+@@ -633,7 +636,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Freeler_Basis.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelPlus_Regio_Nummervoordeel.rst Cistron BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst BelBasis_Regio.rst OneTel_Spaarstand_Regio.rst OneTel_Toets_1658_Regio.rst Tele2_Preselect_Buiten_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst BelBasis_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Makefile.in Tele2_Extra_Buiten_Regio.rst HetNet_Regelmatig_Surfen.rst Makefile.am 
-+KDE_DIST=Freeler_Basis.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelPlus_Regio_Nummervoordeel.rst Cistron BelBasis_Regio.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst OneTel_Spaarstand_Regio.rst OneTel_Toets_1658_Regio.rst Tele2_Preselect_Buiten_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst BelBasis_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Makefile.in Tele2_Extra_Buiten_Regio.rst HetNet_Regelmatig_Surfen.rst Makefile.am 
+-KDE_DIST=Freeler_Basis.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst BelBasis_Regio.rst OneTel_Toets_1658_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst BelBasis_Buiten_Regio.rst Makefile.in HetNet_Regelmatig_Surfen.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst BelPlus_Regio_Nummervoordeel.rst Cistron OneTel_Spaarstand_Regio.rst Tele2_Preselect_Buiten_Regio.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Tele2_Extra_Buiten_Regio.rst Makefile.am 
++KDE_DIST=Freeler_Basis.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelBasis_Regio.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst OneTel_Toets_1658_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst BelBasis_Buiten_Regio.rst Makefile.in HetNet_Regelmatig_Surfen.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst BelPlus_Regio_Nummervoordeel.rst Cistron OneTel_Spaarstand_Regio.rst Tele2_Preselect_Buiten_Regio.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Tele2_Extra_Buiten_Regio.rst Makefile.am 
  
  #>+ 2
  docs-am:
 --- kppp/Rules/Norway/Makefile.in
 +++ kppp/Rules/Norway/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20387,7 +25056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20396,7 +25065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20410,7 +25079,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Poland/Makefile.in
 +++ kppp/Rules/Poland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20420,7 +25089,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -413,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20429,7 +25098,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20443,7 +25112,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Portugal/Makefile.in
 +++ kppp/Rules/Portugal/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20453,7 +25122,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20462,7 +25131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20476,7 +25145,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Romania/Makefile.in
 +++ kppp/Rules/Romania/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20486,7 +25155,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20495,7 +25164,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20507,18 +25176,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -597,7 +600,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Romtelecom_Interjudetean.rst Easynet.rst Romtelecom_Local.rst ClickNet.rst RomTelecom_GSM.rst Romtelecom_Acces_Special_Internet.rst Zapp-Mobile.rst Makefile.in Makefile.am 
-+KDE_DIST=Romtelecom_Interjudetean.rst Easynet.rst ClickNet.rst Romtelecom_Local.rst RomTelecom_GSM.rst Romtelecom_Acces_Special_Internet.rst Zapp-Mobile.rst Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Russia/Makefile.in
 +++ kppp/Rules/Russia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20528,7 +25188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20537,7 +25197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20551,7 +25211,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Singapore/Makefile.in
 +++ kppp/Rules/Singapore/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20561,7 +25221,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20570,7 +25230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20584,7 +25244,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Slovakia/Makefile.in
 +++ kppp/Rules/Slovakia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20594,7 +25254,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20603,7 +25263,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20617,7 +25277,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Slovenia/Makefile.in
 +++ kppp/Rules/Slovenia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20627,7 +25287,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -408,7 +411,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20636,7 +25296,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -446,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20650,7 +25310,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/SouthAfrica/Makefile.in
 +++ kppp/Rules/SouthAfrica/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20660,7 +25320,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20669,7 +25329,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20683,7 +25343,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/SouthAfrika/Makefile.in
 +++ kppp/Rules/SouthAfrika/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20693,7 +25353,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20702,7 +25362,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20716,7 +25376,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Spain/Makefile.in
 +++ kppp/Rules/Spain/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20726,7 +25386,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -410,7 +413,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20735,7 +25395,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -448,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20747,18 +25407,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -597,7 +600,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Infovia.rst Telefonica_Metropolitana_IVA.rst Telefonica_Interprovincial_IVA.rst Telefonica_Local.rst Telefonica_Provincial.rst Telefonica_Nacional.rst Telefonica_Interprovincial.rst Infovia_IVA.rst Makefile.in Telefonica_Metropolitana.rst Telefonica_Provincial_IVA.rst Makefile.am 
-+KDE_DIST=Infovia.rst Telefonica_Metropolitana_IVA.rst Telefonica_Local.rst Telefonica_Interprovincial_IVA.rst Telefonica_Provincial.rst Telefonica_Nacional.rst Telefonica_Interprovincial.rst Infovia_IVA.rst Makefile.in Telefonica_Metropolitana.rst Telefonica_Provincial_IVA.rst Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/Sweden/Makefile.in
 +++ kppp/Rules/Sweden/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20768,7 +25419,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -413,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20777,7 +25428,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20789,18 +25440,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -600,7 +603,7 @@
+@@ -612,7 +615,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=RSLCom.rst Vattenfall.rst Tele8.rst Telitel.rst Glocalnet.rst ACN.rst Telia.rst Telenordia.rst Tele1_Europe.rst Crossnet-Affinity.rst Gts.rst Tiscali.rst Utfors.rst Nemtel.rst Supertel.rst Rix_Telecom.rst Telerian.rst Telia_Telebonus1.rst Transnet.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Makefile.in Plusenergi.rst Home_se.rst Teleman.rst Universal_Telecom.rst Makefile.am Telia_Telebonus2.rst Tele2.rst 
-+KDE_DIST=RSLCom.rst Vattenfall.rst Tele8.rst Telitel.rst Glocalnet.rst ACN.rst Telia.rst Telenordia.rst Tele1_Europe.rst Crossnet-Affinity.rst Gts.rst Tiscali.rst Utfors.rst Nemtel.rst Supertel.rst Rix_Telecom.rst Telerian.rst Telia_Telebonus1.rst Transnet.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Makefile.in Plusenergi.rst Home_se.rst Teleman.rst Universal_Telecom.rst Telia_Telebonus2.rst Makefile.am Tele2.rst 
+-KDE_DIST=Telitel.rst Glocalnet.rst Telia.rst Crossnet-Affinity.rst Gts.rst Utfors.rst Nemtel.rst Rix_Telecom.rst Telerian.rst Transnet.rst Makefile.in Teleman.rst Universal_Telecom.rst RSLCom.rst Vattenfall.rst Tele8.rst ACN.rst Telenordia.rst Tele1_Europe.rst Tiscali.rst Supertel.rst Telia_Telebonus1.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Plusenergi.rst Home_se.rst Makefile.am Telia_Telebonus2.rst Tele2.rst 
++KDE_DIST=Telitel.rst Glocalnet.rst Telia.rst Crossnet-Affinity.rst Gts.rst Utfors.rst Nemtel.rst Rix_Telecom.rst Telerian.rst Transnet.rst Makefile.in Teleman.rst Universal_Telecom.rst RSLCom.rst Vattenfall.rst Tele8.rst ACN.rst Telenordia.rst Tele1_Europe.rst Tiscali.rst Supertel.rst Telia_Telebonus1.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Plusenergi.rst Home_se.rst Telia_Telebonus2.rst Makefile.am Tele2.rst 
  
  #>+ 2
  docs-am:
 --- kppp/Rules/Switzerland/Makefile.in
 +++ kppp/Rules/Switzerland/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20810,7 +25461,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -411,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20819,7 +25470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -449,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20833,7 +25484,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Turkey/Makefile.in
 +++ kppp/Rules/Turkey/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20843,7 +25494,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20852,7 +25503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20866,7 +25517,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Ukraine/Makefile.in
 +++ kppp/Rules/Ukraine/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20876,7 +25527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20885,7 +25536,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20899,7 +25550,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/United_Kingdom/Makefile.in
 +++ kppp/Rules/United_Kingdom/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20909,7 +25560,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -413,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20918,7 +25569,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20932,7 +25583,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Uruguay/Makefile.in
 +++ kppp/Rules/Uruguay/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20942,7 +25593,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20951,7 +25602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20965,7 +25616,7 @@
  mostlyclean-libtool:
 --- kppp/Rules/Yugoslavia/Makefile.in
 +++ kppp/Rules/Yugoslavia/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20975,7 +25626,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20984,7 +25635,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20996,18 +25647,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -596,7 +599,7 @@
+@@ -608,7 +611,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=041_1xx_xxx.rst I_zona-ista_mreza.rst 041_9xx_xxx.rst Lokalni_poziv.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst II_zona-do_200km.rst Makefile.in 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
-+KDE_DIST=041_1xx_xxx.rst I_zona-ista_mreza.rst Lokalni_poziv.rst 041_9xx_xxx.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst II_zona-do_200km.rst Makefile.in 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
+-KDE_DIST=041_1xx_xxx.rst 041_9xx_xxx.rst Lokalni_poziv.rst II_zona-do_200km.rst Makefile.in I_zona-ista_mreza.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
++KDE_DIST=041_1xx_xxx.rst Lokalni_poziv.rst 041_9xx_xxx.rst II_zona-do_200km.rst Makefile.in I_zona-ista_mreza.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
  
  #>+ 2
  docs-am:
 --- krdc/Makefile.in
 +++ krdc/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -279,6 +279,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21017,7 +25668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -508,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21026,7 +25677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -546,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21038,7 +25689,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1045,11 +1048,11 @@
+@@ -1057,11 +1060,11 @@
  mocs: kfullscreenpanel.moc
  
  #>+ 3
@@ -21053,7 +25704,7 @@
  
  #>+ 3
  keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1059,11 +1062,11 @@
+@@ -1071,11 +1074,11 @@
  mocs: keycapturedialog.moc
  
  #>+ 3
@@ -21068,7 +25719,7 @@
  
  #>+ 3
  maindialog.moc: $(srcdir)/maindialog.h
-@@ -1074,10 +1077,10 @@
+@@ -1086,7 +1089,7 @@
  
  #>+ 3
  clean-metasources:
@@ -21076,13 +25727,9 @@
 +	-rm -f  maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc
  
  #>+ 2
--KDE_DIST=keycapturewidget.ui _rfb._tcp pindown.png maindialogwidget.h hostprofiles.ui pointcursor.png rdp.protocol hostprofiles.ui.h maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png Makefile.in smb2rdc.desktop pinup.png pointcursormask.png maindialogbase.ui cr32-app-krdc.png krdc.desktop Makefile.am close.png 
-+KDE_DIST=keycapturewidget.ui _rfb._tcp pindown.png maindialogwidget.h hostprofiles.ui pointcursor.png rdp.protocol hostprofiles.ui.h maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png Makefile.in smb2rdc.desktop pointcursormask.png pinup.png maindialogbase.ui cr32-app-krdc.png krdc.desktop Makefile.am close.png 
+ KDE_DIST=maindialogwidget.h hostprofiles.ui.h Makefile.in smb2rdc.desktop pinup.png maindialogbase.ui keycapturewidget.ui _rfb._tcp pindown.png hostprofiles.ui pointcursor.png rdp.protocol maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png pointcursormask.png cr32-app-krdc.png krdc.desktop Makefile.am close.png 
+@@ -1103,14 +1106,14 @@
  
- #>+ 6
- clean-ui:
-@@ -1091,14 +1094,14 @@
- 
  #>+ 10
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -21099,7 +25746,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1139,7 +1142,7 @@
+@@ -1151,7 +1154,7 @@
  
  
  #>+ 11
@@ -21110,7 +25757,7 @@
  	echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
 --- krdc/rdp/Makefile.in
 +++ krdc/rdp/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -233,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21120,7 +25767,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -439,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21129,7 +25776,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21143,7 +25790,7 @@
  clean-noinstLTLIBRARIES:
 --- krdc/vnc/Makefile.in
 +++ krdc/vnc/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21153,7 +25800,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -455,7 +458,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -21162,7 +25809,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -493,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21176,7 +25823,7 @@
  clean-noinstLTLIBRARIES:
 --- krfb/kcm_krfb/Makefile.in
 +++ krfb/kcm_krfb/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21186,7 +25833,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -458,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21195,7 +25842,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -496,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21207,18 +25854,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -786,7 +789,7 @@
+@@ -798,7 +801,7 @@
  	-rm -f  kcm_krfb.moc
  
  #>+ 2
--KDE_DIST=configurationwidget.ui kcm_krfb.h kcmkrfb.desktop Makefile.in Makefile.am 
-+KDE_DIST=configurationwidget.ui kcmkrfb.desktop kcm_krfb.h Makefile.in Makefile.am 
+-KDE_DIST=configurationwidget.ui Makefile.in kcm_krfb.h kcmkrfb.desktop Makefile.am 
++KDE_DIST=configurationwidget.ui Makefile.in kcmkrfb.desktop kcm_krfb.h Makefile.am 
  
  #>+ 4
  clean-ui:
 --- krfb/kinetd/Makefile.in
 +++ krfb/kinetd/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -244,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21228,7 +25875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -463,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21237,7 +25884,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -501,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21251,7 +25898,7 @@
  	@$(NORMAL_INSTALL)
 --- krfb/krfb/Makefile.in
 +++ krfb/krfb/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21261,7 +25908,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -496,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -21270,7 +25917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -534,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21282,40 +25929,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -960,7 +963,7 @@
+@@ -972,7 +975,7 @@
  	-rm -f  invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
  
  #>+ 2
--KDE_DIST=krfbiface.h invitation.h manageinvitations.ui.h eventsrc personalinvitewidget.ui personalinvitedialog.h trayicon.h eyes-open.png invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr32-app-krfb.png lo16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui connection-side-image.png configuration.h xupdatescanner.h invitedialog.h Makefile.in krfb.desktop eyes-open24.png kinetd_krfb.desktop Makefile.am eyes-closed24.png rfbcontroller.h 
-+KDE_DIST=krfbiface.h invitation.h manageinvitations.ui.h eventsrc personalinvitedialog.h personalinvitewidget.ui eyes-open.png trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr32-app-krfb.png lo16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui connection-side-image.png configuration.h invitedialog.h xupdatescanner.h Makefile.in krfb.desktop eyes-open24.png kinetd_krfb.desktop Makefile.am rfbcontroller.h eyes-closed24.png 
+-KDE_DIST=krfbiface.h manageinvitations.ui.h eventsrc personalinvitewidget.ui eyes-open.png cr32-app-krfb.png lo16-app-krfb.png connection-side-image.png Makefile.in eyes-open24.png rfbcontroller.h invitation.h personalinvitedialog.h trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui configuration.h xupdatescanner.h invitedialog.h krfb.desktop kinetd_krfb.desktop Makefile.am eyes-closed24.png 
++KDE_DIST=krfbiface.h manageinvitations.ui.h eventsrc personalinvitewidget.ui eyes-open.png cr32-app-krfb.png lo16-app-krfb.png connection-side-image.png Makefile.in eyes-open24.png rfbcontroller.h invitation.h personalinvitedialog.h trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui configuration.h invitedialog.h xupdatescanner.h krfb.desktop kinetd_krfb.desktop Makefile.am eyes-closed24.png 
  
  #>+ 5
  clean-idl:
-@@ -983,18 +986,18 @@
+@@ -995,21 +998,21 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/lo16-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/cr32-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
  
  uninstall-kde-icons:
  	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
  	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
  
  #>+ 15
  force-reedit:
 --- krfb/krfb_httpd/Makefile.in
 +++ krfb/krfb_httpd/Makefile.in
-@@ -202,6 +202,9 @@
+@@ -209,6 +209,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21325,7 +25978,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21334,7 +25987,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21348,7 +26001,7 @@
  	@$(NORMAL_INSTALL)
 --- krfb/libvncserver/Makefile.in
 +++ krfb/libvncserver/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21358,7 +26011,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -433,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -21367,7 +26020,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -471,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21381,7 +26034,7 @@
  clean-noinstLTLIBRARIES:
 --- krfb/Makefile.in
 +++ krfb/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -213,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21391,7 +26044,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -415,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21400,7 +26053,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -453,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21414,7 +26067,7 @@
  mostlyclean-libtool:
 --- krfb/srvloc/Makefile.in
 +++ krfb/srvloc/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21424,7 +26077,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -451,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21433,7 +26086,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -489,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21447,7 +26100,7 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/icons/Makefile.in
 +++ ksirc/icons/Makefile.in
-@@ -189,6 +189,9 @@
+@@ -196,6 +196,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21457,7 +26110,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -397,7 +400,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21466,7 +26119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -435,9 +438,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21478,42 +26131,67 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -575,15 +578,15 @@
+@@ -587,42 +590,42 @@
  
- #>+ 33
+ #>+ 39
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
- 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps/ksirc.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
- 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps/ksirc.png
++	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
++	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps/ksirc.png
 +	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
- 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps/ksirc.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps/ksirc.png
+-	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
+-	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps/ksirc.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
- 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-@@ -596,11 +599,11 @@
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksirc.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksirc.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
- 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps/ksirc.png
--	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
- 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps/ksirc.png
-+	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
- 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps/ksirc.png
++	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
++	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps/ksirc.png
+-	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
+-	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps/ksirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
 +	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
- 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksirc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksirc.png
+ 
+ #>+ 15
 --- ksirc/img/emoticons/Makefile.in
 +++ ksirc/img/emoticons/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21523,7 +26201,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21532,7 +26210,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21546,7 +26224,7 @@
  mostlyclean-libtool:
 --- ksirc/img/Makefile.in
 +++ ksirc/img/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21556,7 +26234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21565,7 +26243,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21577,18 +26255,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -772,7 +775,7 @@
+@@ -784,7 +787,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=misc8.png action.png misc1.png mode.png bminus.png channel.xpm ominus.png servinfo.png ksirc_dock.png ppl.png misc2.png bluepin.png madsmiley.png dccget.png part.png misc3.png greenpin.png smiley.png ksirc_a.xpm sdi.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png misc4.png ksirc_dock.xpm dccsend.png join.png ksirc_b.xpm misc5.png minus.png server.xpm info.png error.png tile.xpm channels.xpm miscA.png star.png ctcpping.png misc6.png info1.png mini-run.png notice.png kick.png Makefile.in start.xpm arrow.png stop.xpm misc7.png blueball.png X.png mdi.png plus.png bplus.png quit.png misc9.png Makefile.am elipsis.png 
-+KDE_DIST=misc8.png action.png misc1.png mode.png bminus.png channel.xpm ominus.png servinfo.png ksirc_dock.png ppl.png misc2.png bluepin.png madsmiley.png dccget.png part.png misc3.png greenpin.png smiley.png ksirc_a.xpm sdi.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png misc4.png ksirc_dock.xpm join.png dccsend.png ksirc_b.xpm misc5.png minus.png server.xpm error.png tile.xpm info.png channels.xpm miscA.png star.png ctcpping.png misc6.png info1.png mini-run.png kick.png notice.png Makefile.in start.xpm stop.xpm arrow.png misc7.png blueball.png X.png mdi.png plus.png quit.png bplus.png misc9.png Makefile.am elipsis.png 
+-KDE_DIST=action.png misc1.png mode.png bminus.png ominus.png ksirc_dock.png ppl.png misc2.png dccget.png misc3.png greenpin.png smiley.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png ksirc_dock.xpm dccsend.png ksirc_b.xpm info.png tile.xpm channels.xpm miscA.png ctcpping.png misc6.png info1.png Makefile.in stop.xpm misc7.png blueball.png X.png mdi.png bplus.png misc9.png elipsis.png misc8.png channel.xpm servinfo.png bluepin.png madsmiley.png part.png ksirc_a.xpm sdi.png misc4.png join.png misc5.png minus.png server.xpm error.png star.png mini-run.png notice.png kick.png start.xpm arrow.png plus.png quit.png Makefile.am 
++KDE_DIST=action.png misc1.png mode.png bminus.png ominus.png ksirc_dock.png ppl.png misc2.png dccget.png misc3.png greenpin.png smiley.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png ksirc_dock.xpm dccsend.png ksirc_b.xpm tile.xpm info.png channels.xpm miscA.png ctcpping.png misc6.png info1.png Makefile.in stop.xpm misc7.png blueball.png X.png mdi.png bplus.png misc9.png elipsis.png misc8.png channel.xpm servinfo.png bluepin.png madsmiley.png part.png ksirc_a.xpm sdi.png misc4.png join.png misc5.png minus.png server.xpm error.png star.png mini-run.png kick.png notice.png start.xpm arrow.png plus.png quit.png Makefile.am 
  
  #>+ 2
  docs-am:
 --- ksirc/KSOpenkSirc/Makefile.in
 +++ ksirc/KSOpenkSirc/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -244,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21598,7 +26276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21607,7 +26285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21621,7 +26299,7 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSPrefs/Makefile.in
 +++ ksirc/KSPrefs/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21631,7 +26309,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21640,7 +26318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21654,7 +26332,7 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSProgress/Makefile.in
 +++ ksirc/KSProgress/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21664,7 +26342,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -435,7 +438,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21673,7 +26351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21687,7 +26365,7 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSTicker/Makefile.in
 +++ ksirc/KSTicker/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21697,7 +26375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -451,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21706,7 +26384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -489,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21720,7 +26398,7 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/Makefile.in
 +++ ksirc/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -323,6 +323,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21730,7 +26408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -675,7 +678,7 @@
+@@ -687,7 +690,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -21739,7 +26417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -713,9 +716,9 @@
+@@ -725,9 +728,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21751,7 +26429,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1344,18 +1347,18 @@
+@@ -1356,18 +1359,18 @@
  ksirc_DEPENDENCIES = libkdeinit_ksirc.la
  
  #>+ 3
@@ -21776,7 +26454,7 @@
  
  #>+ 3
  ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1372,13 +1375,6 @@
+@@ -1384,13 +1387,6 @@
  mocs: ssfeprompt.moc
  
  #>+ 3
@@ -21790,7 +26468,7 @@
  FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
  	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
  
-@@ -1393,6 +1389,13 @@
+@@ -1405,6 +1401,13 @@
  mocs: ahistlineedit.moc
  
  #>+ 3
@@ -21804,7 +26482,7 @@
  alistbox.moc: $(srcdir)/alistbox.h
  	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
  
-@@ -1421,13 +1424,6 @@
+@@ -1433,13 +1436,6 @@
  mocs: ksview.moc
  
  #>+ 3
@@ -21818,7 +26496,7 @@
  ioLAG.moc: $(srcdir)/ioLAG.h
  	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
  
-@@ -1435,18 +1431,18 @@
+@@ -1447,18 +1443,18 @@
  mocs: ioLAG.moc
  
  #>+ 3
@@ -21843,7 +26521,7 @@
  
  #>+ 3
  colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1463,6 +1459,13 @@
+@@ -1475,6 +1471,13 @@
  mocs: objFinder.moc
  
  #>+ 3
@@ -21857,7 +26535,7 @@
  displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
  	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
  
-@@ -1491,18 +1494,18 @@
+@@ -1503,18 +1506,18 @@
  mocs: dccToplevel.moc
  
  #>+ 3
@@ -21882,7 +26560,7 @@
  
  #>+ 3
  dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1527,7 +1530,7 @@
+@@ -1539,7 +1542,7 @@
  
  #>+ 3
  clean-metasources:
@@ -21890,8 +26568,8 @@
 +	-rm -f  ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc colorpicker.moc objFinder.moc topic.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc kstextview.moc ioNotify.moc
  
  #>+ 2
- KDE_DIST=chanButtons.h topic.h advfollow.pl sirc.help.gz nickColourMaker.h ksircrc eventsrc displayMgrMDI.h ksircserver.h ksirc.pl Artistic stringparserstate.h FilterRuleEditor.dlg ksirc.desktop default.pl dccNewbase.ui kstextview.h charSelector.h ksircchannel.h FAQ relnotes filters.pl logfile.h colorpicker.h openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in dsirc mditoplevel.h autodcc.pl version.h Makefile.am dccManagerbase.ui 
-@@ -1581,7 +1584,7 @@
+ KDE_DIST=advfollow.pl sirc.help.gz nickColourMaker.h eventsrc displayMgrMDI.h ksircserver.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in autodcc.pl dccManagerbase.ui chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop dccNewbase.ui ksircchannel.h FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h Makefile.am 
+@@ -1593,7 +1596,7 @@
  
  
  #>+ 11
@@ -21902,7 +26580,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
 --- ksirc/puke/Makefile.in
 +++ ksirc/puke/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -248,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21912,7 +26590,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21921,7 +26599,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21933,7 +26611,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -884,18 +887,18 @@
+@@ -896,18 +899,18 @@
  mocs: ptablevw.moc
  
  #>+ 3
@@ -21958,7 +26636,7 @@
  
  #>+ 3
  pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -906,10 +909,10 @@
+@@ -918,7 +921,7 @@
  
  #>+ 3
  clean-metasources:
@@ -21966,14 +26644,10 @@
 +	-rm -f  pframe.moc ptabdialog.moc plabel.moc playout.moc plined.moc pobject.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
  
  #>+ 2
--KDE_DIST=pobjfinder.h load_all.pm plistbox.pm pmenudta.pm pkfiledialog.pm dcc_progress.pm palistbox.pm ptablevw.pm plabel.pm small.pl ppopmenu.pm pprogress.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h pkfiledialog.h dcc_status.pm ptabdialog.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm Makefile.am 
-+KDE_DIST=pobjfinder.h load_all.pm plistbox.pm pmenudta.pm pkfiledialog.pm palistbox.pm dcc_progress.pm ptablevw.pm plabel.pm small.pl ppopmenu.pm pprogress.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h pkfiledialog.h dcc_status.pm ptabdialog.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm Makefile.am 
+ KDE_DIST=pobjfinder.h load_all.pm palistbox.pm ppopmenu.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h dcc_status.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm plistbox.pm pmenudta.pm pkfiledialog.pm dcc_progress.pm ptablevw.pm plabel.pm small.pl pprogress.pm pkfiledialog.h ptabdialog.pm Makefile.am 
+@@ -965,7 +968,7 @@
  
- #>+ 2
- docs-am:
-@@ -953,7 +956,7 @@
  
- 
  #>+ 11
 -libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp  pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
 +libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp  pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc pmenudta.moc ppopmenu.moc pkfiledialog.moc
@@ -21982,7 +26656,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
 --- ktalkd/kcmktalkd/Makefile.in
 +++ ktalkd/kcmktalkd/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21992,7 +26666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22001,7 +26675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22013,7 +26687,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -785,18 +788,18 @@
+@@ -794,18 +797,18 @@
  mocs: answmachpage.moc
  
  #>+ 3
@@ -22038,7 +26712,7 @@
  
  #>+ 3
  forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -807,10 +810,10 @@
+@@ -816,7 +819,7 @@
  
  #>+ 3
  clean-metasources:
@@ -22046,15 +26720,13 @@
 +	-rm -f  answmachpage.moc main.moc soundpage.moc forwmachpage.moc
  
  #>+ 2
--KDE_DIST=cr48-app-ktalkd.png forwmachpage.h cr128-app-ktalkd.png main.h cr32-app-ktalkd.png soundpage.h cr16-app-ktalkd.png Makefile.in kcmktalkd.desktop answmachpage.h Makefile.am 
-+KDE_DIST=forwmachpage.h cr48-app-ktalkd.png cr128-app-ktalkd.png main.h cr32-app-ktalkd.png soundpage.h cr16-app-ktalkd.png Makefile.in kcmktalkd.desktop answmachpage.h Makefile.am 
+ KDE_DIST=cr48-app-ktalkd.png cr128-app-ktalkd.png main.h cr22-app-ktalkd.png soundpage.h Makefile.in forwmachpage.h cr32-app-ktalkd.png cr16-app-ktalkd.png kcmktalkd.desktop answmachpage.h Makefile.am 
+@@ -830,23 +833,23 @@
  
- #>+ 3
- clean-closures:
-@@ -821,20 +824,20 @@
- 
- #>+ 16
+ #>+ 19
  install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -22067,18 +26739,22 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
  
  uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktalkd.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktalkd.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
  
  #>+ 15
  force-reedit:
-@@ -875,7 +878,7 @@
+@@ -887,7 +890,7 @@
  
  
  #>+ 11
@@ -22089,7 +26765,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
 --- ktalkd/ktalkd/machines/Makefile.in
 +++ ktalkd/ktalkd/machines/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22099,7 +26775,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22108,7 +26784,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22122,7 +26798,7 @@
  clean-noinstLIBRARIES:
 --- ktalkd/ktalkd/Makefile.in
 +++ ktalkd/ktalkd/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -264,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22132,7 +26808,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -22141,7 +26817,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22153,18 +26829,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -910,7 +913,7 @@
+@@ -922,7 +925,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=table.h announce.h readconf.h proto.h defs.h includ.h options.h ktalkd.wav process.h find_user.h unixsock.h prot_talkd.h otalkd.h threads.h readconf.cpp Makefile.in Makefile.am 
-+KDE_DIST=table.h announce.h proto.h readconf.h defs.h includ.h options.h ktalkd.wav process.h find_user.h unixsock.h prot_talkd.h otalkd.h threads.h readconf.cpp Makefile.in Makefile.am 
+-KDE_DIST=announce.h defs.h includ.h find_user.h unixsock.h prot_talkd.h readconf.cpp Makefile.in table.h readconf.h proto.h options.h ktalkd.wav process.h otalkd.h threads.h Makefile.am 
++KDE_DIST=announce.h defs.h includ.h find_user.h unixsock.h prot_talkd.h readconf.cpp Makefile.in table.h proto.h readconf.h options.h ktalkd.wav process.h otalkd.h threads.h Makefile.am 
  
  #>+ 2
  docs-am:
 --- ktalkd/ktalkdlg/Makefile.in
 +++ ktalkd/ktalkdlg/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22174,7 +26850,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -434,7 +437,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22183,7 +26859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22197,7 +26873,7 @@
  	@$(NORMAL_INSTALL)
 --- ktalkd/mail.local/Makefile.in
 +++ ktalkd/mail.local/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22207,7 +26883,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -426,7 +429,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -22216,7 +26892,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -464,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22230,7 +26906,7 @@
  	@$(NORMAL_INSTALL)
 --- ktalkd/Makefile.in
 +++ ktalkd/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -215,6 +215,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22240,7 +26916,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -414,7 +417,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22249,7 +26925,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -452,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22263,7 +26939,7 @@
  mostlyclean-libtool:
 --- lanbrowsing/kcmlisa/Makefile.in
 +++ lanbrowsing/kcmlisa/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22273,7 +26949,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -462,7 +465,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22282,7 +26958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -500,9 +503,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22294,7 +26970,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -889,18 +892,18 @@
+@@ -901,18 +904,18 @@
  
  
  #>+ 3
@@ -22319,7 +26995,7 @@
  
  #>+ 3
  kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -925,7 +928,7 @@
+@@ -937,7 +940,7 @@
  
  #>+ 3
  clean-metasources:
@@ -22327,8 +27003,8 @@
 +	-rm -f  portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
  
  #>+ 2
- KDE_DIST=kcmreslisa.desktop findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop portsettingsbar.h configure.in.in kcmlisa.h Makefile.in kcmkiolan.h setupwizard.h Makefile.am 
-@@ -976,7 +979,7 @@
+ KDE_DIST=kcmreslisa.desktop portsettingsbar.h Makefile.in findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop configure.in.in kcmlisa.h kcmkiolan.h setupwizard.h Makefile.am 
+@@ -988,7 +991,7 @@
  
  
  #>+ 11
@@ -22339,7 +27015,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
 --- lanbrowsing/kio_lan/Makefile.in
 +++ lanbrowsing/kio_lan/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22349,7 +27025,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -463,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22358,7 +27034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -501,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22372,7 +27048,7 @@
  	@$(NORMAL_INSTALL)
 --- lanbrowsing/lisa/Makefile.in
 +++ lanbrowsing/lisa/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -259,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22382,7 +27058,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -476,7 +479,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22391,7 +27067,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -514,9 +517,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22405,7 +27081,7 @@
  	@$(NORMAL_INSTALL)
 --- lanbrowsing/Makefile.in
 +++ lanbrowsing/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -212,6 +212,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22415,7 +27091,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22424,7 +27100,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22438,7 +27114,7 @@
  mostlyclean-libtool:
 --- librss/Makefile.in
 +++ librss/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -251,6 +251,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22448,7 +27124,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -465,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22457,7 +27133,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -503,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22469,7 +27145,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -817,7 +820,7 @@
+@@ -829,7 +832,7 @@
  	-rm -f  loader.moc image.moc testlibrss.moc
  
  #>+ 2
@@ -22480,7 +27156,7 @@
  clean-closures:
 --- Makefile.in
 +++ Makefile.in
-@@ -222,6 +222,9 @@
+@@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22490,16 +27166,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -435,7 +438,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,12 +467,12 @@
+@@ -477,12 +480,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -22514,7 +27190,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -481,7 +484,7 @@
+@@ -494,7 +497,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -22523,18 +27199,18 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -898,7 +901,7 @@
+@@ -1004,7 +1007,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- wifi/kcmwifi/Makefile.in
 +++ wifi/kcmwifi/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22544,7 +27220,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -461,7 +464,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22553,7 +27229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -499,9 +502,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22565,7 +27241,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -788,22 +791,22 @@
+@@ -801,18 +804,18 @@
  mocs: mainconfig.moc
  
  #>+ 3
@@ -22589,24 +27265,28 @@
 +mocs: ifconfigpage.moc
  
  #>+ 3
+ wificonfig.moc: $(srcdir)/wificonfig.h
+@@ -823,7 +826,7 @@
+ 
+ #>+ 3
  clean-metasources:
--	-rm -f  mainconfig.moc ifconfigpage.moc kcmwifi.moc
-+	-rm -f  mainconfig.moc kcmwifi.moc ifconfigpage.moc
+-	-rm -f  mainconfig.moc ifconfigpage.moc kcmwifi.moc wificonfig.moc
++	-rm -f  mainconfig.moc kcmwifi.moc ifconfigpage.moc wificonfig.moc
  
  #>+ 2
- KDE_DIST=mainconfigbase.ui mainconfig.h ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configcrypto.ui configcrypto.ui.h configpower.ui configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h Makefile.am 
-@@ -862,7 +865,7 @@
+ KDE_DIST=mainconfigbase.ui mainconfig.h configcrypto.ui configcrypto.ui.h configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h vendorconfig.h indent-options ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configpower.ui Makefile.am 
+@@ -882,7 +885,7 @@
  
  
  #>+ 11
--kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc kcmwifi.moc ifconfigpage.moc configpower.moc ifconfigpagebase.moc configcrypto.moc
-+kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc ifconfigpage.moc kcmwifi.moc configpower.moc ifconfigpagebase.moc configcrypto.moc
+-kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp $(srcdir)/vendorconfig.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc kcmwifi.moc ifconfigpage.moc configpower.moc wificonfig.moc ifconfigpagebase.moc configcrypto.moc
++kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp $(srcdir)/vendorconfig.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc ifconfigpage.moc kcmwifi.moc configpower.moc wificonfig.moc ifconfigpagebase.moc configcrypto.moc
  	@echo 'creating kcm_wifi_la.all_cpp.cpp ...'; \
  	rm -f kcm_wifi_la.all_cpp.files kcm_wifi_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
 --- wifi/kwireless/Makefile.in
 +++ wifi/kwireless/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22616,7 +27296,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -457,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22625,7 +27305,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -495,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22639,7 +27319,7 @@
  	@$(NORMAL_INSTALL)
 --- wifi/locations/Makefile.in
 +++ wifi/locations/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22649,7 +27329,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -407,7 +410,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22658,7 +27338,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -445,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22672,7 +27352,7 @@
  mostlyclean-libtool:
 --- wifi/Makefile.in
 +++ wifi/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -274,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22682,7 +27362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -523,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22691,7 +27371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -561,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22703,51 +27383,94 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1005,29 +1008,29 @@
+@@ -979,18 +982,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub interface_dcop.kidl
  
+ #>+ 3
+-networkscanning.moc: $(srcdir)/networkscanning.h
+-	$(MOC) $(srcdir)/networkscanning.h -o networkscanning.moc
++interface_wireless_wirelessextensions.moc: $(srcdir)/interface_wireless_wirelessextensions.h
++	$(MOC) $(srcdir)/interface_wireless_wirelessextensions.h -o interface_wireless_wirelessextensions.moc
+ 
+ #>+ 2
+-mocs: networkscanning.moc
++mocs: interface_wireless_wirelessextensions.moc
+ 
+ #>+ 3
+-interface_wireless_wirelessextensions.moc: $(srcdir)/interface_wireless_wirelessextensions.h
+-	$(MOC) $(srcdir)/interface_wireless_wirelessextensions.h -o interface_wireless_wirelessextensions.moc
++networkscanning.moc: $(srcdir)/networkscanning.h
++	$(MOC) $(srcdir)/networkscanning.h -o networkscanning.moc
+ 
+ #>+ 2
+-mocs: interface_wireless_wirelessextensions.moc
++mocs: networkscanning.moc
+ 
+ #>+ 3
+ interface_wireless.moc: $(srcdir)/interface_wireless.h
+@@ -1015,7 +1018,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  networkscanning.moc interface_wireless_wirelessextensions.moc interface_wireless.moc kwifimanager.moc strength.moc
++	-rm -f  interface_wireless_wirelessextensions.moc networkscanning.moc interface_wireless.moc kwifimanager.moc strength.moc
+ 
+ #>+ 2
+ KDE_DIST=kwifimanagerui.rc hi64-app-kwifimanager.png hi16-app-kwifimanager.png hi128-app-kwifimanager.png hi32-app-kwifimanager.png hi22-app-kwifimanager.png hisc-app-kwifimanager.svgz Makefile.in hi48-app-kwifimanager.png configure.in.in kwifimanager.desktop Makefile.am 
+@@ -1030,29 +1033,29 @@
+ 
  #>+ 25
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/crsc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwifimanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwifimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwifimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwifimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwifimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwifimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
  
  #>+ 15
  force-reedit:
+@@ -1093,7 +1096,7 @@
+ 
+ 
+ #>+ 11
+-kwifimanager.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/interface_wireless.cpp $(srcdir)/interface_wireless_wirelessextensions.cpp $(srcdir)/networkscanning.cpp $(srcdir)/kwifimanager.cpp $(srcdir)/locator.cpp $(srcdir)/main.cpp $(srcdir)/picture.cpp $(srcdir)/speed.cpp $(srcdir)/statistics.cpp $(srcdir)/status.cpp $(srcdir)/strength.cpp $(srcdir)/asusled.cpp interface_dcop_skel.cpp  interface_wireless_wirelessextensions.moc networkscanning.moc interface_wireless.moc kwifimanager.moc strength.moc
++kwifimanager.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/interface_wireless.cpp $(srcdir)/interface_wireless_wirelessextensions.cpp $(srcdir)/networkscanning.cpp $(srcdir)/kwifimanager.cpp $(srcdir)/locator.cpp $(srcdir)/main.cpp $(srcdir)/picture.cpp $(srcdir)/speed.cpp $(srcdir)/statistics.cpp $(srcdir)/status.cpp $(srcdir)/strength.cpp $(srcdir)/asusled.cpp interface_dcop_skel.cpp  networkscanning.moc interface_wireless_wirelessextensions.moc interface_wireless.moc kwifimanager.moc strength.moc
+ 	@echo 'creating kwifimanager.all_cpp.cpp ...'; \
+ 	rm -f kwifimanager.all_cpp.files kwifimanager.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kwifimanager.all_cpp.final; \
 --- wifi/pixmaps/Makefile.in
 +++ wifi/pixmaps/Makefile.in
-@@ -199,6 +199,9 @@
+@@ -206,6 +206,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22757,7 +27480,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -415,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22766,7 +27489,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -453,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22778,12 +27501,3 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -602,7 +605,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=good.png no_card.png offline.png oor_minimum.png ad_hoc.svg marginal.png ap_connect.png no_card.svg ap_connect.svg Makefile.in all_alone.svg all_alone.png oor_down.png excellent.png ad_hoc.png Makefile.am 
-+KDE_DIST=good.png no_card.png offline.png ad_hoc.svg oor_minimum.png marginal.png ap_connect.png no_card.svg ap_connect.svg Makefile.in all_alone.svg all_alone.png oor_down.png excellent.png ad_hoc.png Makefile.am 
- 
- #>+ 2
- docs-am:




More information about the pkg-kde-commits mailing list